diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/InstitutionDashboardExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/InstitutionDashboardExecutor.java index 13c9fc8..6236967 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/InstitutionDashboardExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/InstitutionDashboardExecutor.java @@ -114,7 +114,7 @@ public class InstitutionDashboardExecutor implements InstitutionDashboardApi { } 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(); co.setTotalProjects(total); @@ -151,7 +151,9 @@ public class InstitutionDashboardExecutor implements InstitutionDashboardApi { List projects = listOrgProjects(orgId); Map> 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 list = new ArrayList<>(); for (Map.Entry> entry : grouped.entrySet()) { @@ -182,7 +184,9 @@ public class InstitutionDashboardExecutor implements InstitutionDashboardApi { List projects = listOrgProjects(orgId); Map> 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 items = new ArrayList<>(); for (Map.Entry> entry : grouped.entrySet()) {