新增监管端和机构端首页数据
parent
f98bdee91f
commit
4d426f2bc1
|
|
@ -114,7 +114,7 @@ public class InstitutionDashboardExecutor implements InstitutionDashboardApi {
|
||||||
}
|
}
|
||||||
|
|
||||||
int archived = (int) projects.stream().filter(p -> Boolean.TRUE.equals(p.getArchiveFlag())).count();
|
int archived = (int) projects.stream().filter(p -> Boolean.TRUE.equals(p.getArchiveFlag())).count();
|
||||||
int delayed = evalProjectGateway.countByOrgIdAndProgressStatus(orgId, "DELAY");
|
int delayed = (int) evalProjectGateway.countByOrgIdAndProgressStatus(orgId, "DELAY");
|
||||||
|
|
||||||
InstitutionDashboardProjectNodeStatsCO co = new InstitutionDashboardProjectNodeStatsCO();
|
InstitutionDashboardProjectNodeStatsCO co = new InstitutionDashboardProjectNodeStatsCO();
|
||||||
co.setTotalProjects(total);
|
co.setTotalProjects(total);
|
||||||
|
|
@ -151,7 +151,9 @@ public class InstitutionDashboardExecutor implements InstitutionDashboardApi {
|
||||||
List<EvalProjectEntity> projects = listOrgProjects(orgId);
|
List<EvalProjectEntity> projects = listOrgProjects(orgId);
|
||||||
|
|
||||||
Map<String, List<EvalProjectEntity>> grouped = projects.stream()
|
Map<String, List<EvalProjectEntity>> grouped = projects.stream()
|
||||||
.collect(Collectors.groupingBy(EvalProjectEntity::getIndustryCode, LinkedHashMap::new, Collectors.toList()));
|
.collect(Collectors.groupingBy(
|
||||||
|
p -> p.getIndustryCode() != null ? p.getIndustryCode() : "其他",
|
||||||
|
LinkedHashMap::new, Collectors.toList()));
|
||||||
|
|
||||||
List<InstitutionDashboardIndustryStatCO.IndustryStat> list = new ArrayList<>();
|
List<InstitutionDashboardIndustryStatCO.IndustryStat> list = new ArrayList<>();
|
||||||
for (Map.Entry<String, List<EvalProjectEntity>> entry : grouped.entrySet()) {
|
for (Map.Entry<String, List<EvalProjectEntity>> entry : grouped.entrySet()) {
|
||||||
|
|
@ -182,7 +184,9 @@ public class InstitutionDashboardExecutor implements InstitutionDashboardApi {
|
||||||
List<EvalProjectEntity> projects = listOrgProjects(orgId);
|
List<EvalProjectEntity> projects = listOrgProjects(orgId);
|
||||||
|
|
||||||
Map<String, List<EvalProjectEntity>> grouped = projects.stream()
|
Map<String, List<EvalProjectEntity>> grouped = projects.stream()
|
||||||
.collect(Collectors.groupingBy(EvalProjectEntity::getEvalTypeCode, LinkedHashMap::new, Collectors.toList()));
|
.collect(Collectors.groupingBy(
|
||||||
|
p -> p.getEvalTypeCode() != null ? p.getEvalTypeCode() : "其他",
|
||||||
|
LinkedHashMap::new, Collectors.toList()));
|
||||||
|
|
||||||
List<InstitutionDashboardEvalTypeRatioCO.EvalTypeRatio> items = new ArrayList<>();
|
List<InstitutionDashboardEvalTypeRatioCO.EvalTypeRatio> items = new ArrayList<>();
|
||||||
for (Map.Entry<String, List<EvalProjectEntity>> entry : grouped.entrySet()) {
|
for (Map.Entry<String, List<EvalProjectEntity>> entry : grouped.entrySet()) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue