|
@ -601,7 +601,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
List<HuzhouProjectinfo> projectInfoList = projectinfoMapper.selectBatchIds(zxmIds); |
|
|
List<HuzhouProjectinfo> projectInfoList = projectinfoMapper.selectBatchIds(zxmIds); |
|
|
List<HuzhouSubProjectinfo> cProjectinfoList = subProjectinfoService.listByProjectIds(cxmIds); |
|
|
List<HuzhouSubProjectinfo> cProjectinfoList = subProjectinfoService.listByProjectIds(cxmIds); |
|
|
projectInfoList.addAll(cProjectinfoList); |
|
|
projectInfoList.addAll(cProjectinfoList); |
|
|
Map<String, String> projectStage = dictService.selectByDictType("projectStage").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getValue())); |
|
|
List<Select> projectStage1 = dictService.selectByDictType("projectStage").stream().collect(Collectors.toList()); |
|
|
|
|
|
Map<String, String> projectStage = dictService.selectByDictType("projectStage").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel())); |
|
|
Map<String, String> reformTasks = dictService.selectByDictType("reformTasks").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel())); |
|
|
Map<String, String> reformTasks = dictService.selectByDictType("reformTasks").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel())); |
|
|
//根据项目状态统计
|
|
|
//根据项目状态统计
|
|
|
List<ProjectStatusOV> projectStatusList= new ArrayList<>(); |
|
|
List<ProjectStatusOV> projectStatusList= new ArrayList<>(); |
|
|