From 85356ca7139886c75249ba83483e9bc9822daf54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Thu, 3 Aug 2023 18:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/dashboard/manage/DashboardExpertManage.java | 5 ----- .../pmapi/dashboard/manage/DashboardProjectManage.java | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardExpertManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardExpertManage.java index 076088d..ada659c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardExpertManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardExpertManage.java @@ -105,7 +105,6 @@ public class DashboardExpertManage { assemblerAnalysisChart(degreeCodeMap, ChartTypeEnum.REGION_EXPERT_EDUCATION_CHART); analysisChartList.add(regionExpertEducationChartAnalysisChart); - // 区域职称级别分布 List titleLevelExpertDictionaryList = iExpertDictionaryService .listByUserId(regionDegreeExpertIdList, DictExpertInfoTypeEnum.TITLE_LEVEL); @@ -115,10 +114,8 @@ public class DashboardExpertManage { AnalysisChart regionExpertTitleLevelChartAnalysisChart = assemblerAnalysisChart(titleLevelCodeMap, ChartTypeEnum.REGION_EXPERT_TITLE_LEVEL_CHART); analysisChartList.add(regionExpertTitleLevelChartAnalysisChart); - } - // 评审次数 List normalMeetingList = iMeetingService.list(Wrappers.lambdaQuery(Meeting.class) .eq(StringUtils.isNotBlank(queryRegionCode), Meeting::getRegionCode, queryRegionCode) @@ -152,9 +149,7 @@ public class DashboardExpertManage { starExpertBO.setExpertId(expertId); starExpertBO.setExpertName(expertName); starExpertList.add(starExpertBO); - starExpertList.add(starExpertBO); } - starExpertList = starExpertList.stream() .sorted(Comparator.comparing(StarExpertBO::getAveragePerformanceScore) .reversed()).collect(Collectors.toList()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java index 5f440f0..b85bf9b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java @@ -69,18 +69,27 @@ public class DashboardProjectManage { QueryTimeYearBO queryTimeYearBO = getQueryTimeYearBO(queryYearPO.getYear()); List allProjectList = iProjectService.list(Wrappers.lambdaQuery(Project.class) .eq(Project::getNewest, true) - .eq(Project::getProjectYear, year) - ); + .eq(Project::getProjectYear, year)); // 项目总数 Integer projectCnt = allProjectList.size(); - List toBeApprovedProjectCnt = allProjectList.stream() + + // 待立项项目数 + List toBeApprovedProjectList = allProjectList.stream() .filter(r -> ProjectStatusEnum.TO_BE_APPROVED.getCode().equals(r.getStatus())) .collect(Collectors.toList()); + Integer toBeApprovedProjectCnt = toBeApprovedProjectList.size(); + // 已立项项目数 + Integer approvedProjectCnt = projectCnt - toBeApprovedProjectCnt; - return null; + // 装配返回VO + DashboardProjectSummaryVO dashboardProjectSummaryVO = new DashboardProjectSummaryVO(); + dashboardProjectSummaryVO.setProjectCnt(projectCnt); + dashboardProjectSummaryVO.setApprovedProjectCnt(approvedProjectCnt); + dashboardProjectSummaryVO.setToBeApprovedProjectCnt(toBeApprovedProjectCnt); + return dashboardProjectSummaryVO; } public DashboardInvestmentSummaryVO getInvestmentSummary(QueryYearPO queryYearPO) {