项目统计

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<ExpertDictionary> 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<Meeting> 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());

pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java

@@ -69,18 +69,27 @@ public class DashboardProjectManage {
         QueryTimeYearBO queryTimeYearBO = getQueryTimeYearBO(queryYearPO.getYear());
         List<Project> allProjectList = iProjectService.list(Wrappers.lambdaQuery(Project.class)
                 .eq(Project::getNewest, true)
-                .eq(Project::getProjectYear, year)
-        );
+                .eq(Project::getProjectYear, year));
 
         // 项目总数
         Integer projectCnt = allProjectList.size();
-        List<Project> toBeApprovedProjectCnt = allProjectList.stream()
+
+        // 待立项项目数
+        List<Project> 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) {