统计1.3

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -89,6 +89,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     @Autowired
     private IHuzhouUploadfileinfoService uploadfileinfoService;
 
+    @Autowired
+    private SysDictService dictService;
+
     @Autowired
     @Lazy
     IHuzhouSubProjectinfoService subProjectinfoService;
@@ -598,11 +601,13 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         List<HuzhouProjectinfo> projectInfoList = projectinfoMapper.selectBatchIds(zxmIds);
         List<HuzhouSubProjectinfo> cProjectinfoList = subProjectinfoService.listByProjectIds(cxmIds);
         projectInfoList.addAll(cProjectinfoList);
+        Map<String, String> projectStage = dictService.selectByDictType("projectStage").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getValue()));
+        Map<String, String> reformTasks = dictService.selectByDictType("reformTasks").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel()));
         //根据项目状态统计
         List<ProjectStatusOV> projectStatusList= new ArrayList<>();
         Map<String, List<HuzhouProjectinfo>> statusCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getStage()));
         for(String key:statusCountMap.keySet()){
-           projectStatusList.add(ProjectStatusOV.builder().name(key).value(statusCountMap.get(key).size()).build());
+           projectStatusList.add(ProjectStatusOV.builder().name(projectStage.get(key)).value(statusCountMap.get(key).size()).build());
         }
         //根据所属改革任务统计(阶段完成情况)
         List<CommonCountOV> projectByReformList= new ArrayList<>();
@@ -610,7 +615,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         for (String key:reformCountMap.keySet()){
             List<String> keyProjectIdsList = reformCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
             Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
-            projectByReformList.add(CommonCountOV.builder().name(key).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
+            projectByReformList.add(CommonCountOV.builder().name(reformTasks.get(key)).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
 
         }
         //根据行政区统计