From 4d426f2bc1168c230992824de721cec506bb6782 Mon Sep 17 00:00:00 2001 From: huwei <3313749341@qq.com> Date: Fri, 31 Jul 2026 15:52:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=91=E7=AE=A1=E7=AB=AF?= =?UTF-8?q?=E5=92=8C=E6=9C=BA=E6=9E=84=E7=AB=AF=E9=A6=96=E9=A1=B5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../institution/InstitutionDashboardExecutor.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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()) {