From 2a29572ab5b4fcd6f49d258a6dedd8cf2394daed Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Wed, 11 Sep 2024 11:44:07 +0800
Subject: [PATCH] 湖北水库：项目进度排序
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 105 insertions(+), 14 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
index 9edb1e2..868e1a8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -289,26 +289,31 @@
@Override
public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
List<SgProjectInfoVO> list = new ArrayList<>();
- if(!searchDTO.getAdCode().isEmpty()){
+ if(StringUtils.isNotBlank(searchDTO.getAdCode())){
list = sgProjectInfoMapper.progressList1(page, searchDTO);
}else {
list = sgProjectInfoMapper.progressList(page, searchDTO);
}
- List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
- searchDTO.setProjectIds(ids);
- List<SgProjectInfoDO> projectProgress = new ArrayList<>();
- if(!searchDTO.getAdCode().isEmpty()){
- projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
- }else {
- projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
- }
+// List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
+// searchDTO.setProjectIds(ids);
+// List<SgProjectInfoDO> projectProgress = new ArrayList<>();
+// if(StringUtils.isNotBlank(searchDTO.getAdCode())){
+// projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
+// }else {
+// projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+// }
- if (CollectionUtils.isNotEmpty(projectProgress)){
- Map<Long, String> progressMap = projectProgress.stream().filter(s->s!=null && s.getProjectProgress() !=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
+// if (CollectionUtils.isNotEmpty(projectProgress)){
+ //Map<Long, String> progressMap = projectProgress.stream().filter(s->s!=null && s.getProjectProgress() !=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
list.forEach(s->{
- s.setProjectProgress(progressMap.get(s.getId()));
- });}
+ if (StringUtils.isNotBlank(s.getProjectProgress())){
+ s.setProjectProgress(s.getProjectProgress()+"%");
+ }else {
+ s.setProjectProgress("0%");
+ }
+ });
+// }
return page.setRecords(list);
}
@@ -560,7 +565,7 @@
Map<String, Object> map = new HashMap<>();
List<SgProjectInfoVO> progressList = progressList(searchDTO);
BigDecimal reduce = progressList.stream().filter(s->s.getProjectProgressNum()!=null).map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal divide = reduce.divide(BigDecimal.valueOf(progressList.size()), 2, RoundingMode.HALF_UP);
+ BigDecimal divide = reduce.divide(BigDecimal.valueOf(progressList.size()==0?1:progressList.size()), 2, RoundingMode.HALF_UP);
List<SgProjectInfoDO> pending = progressList.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
List<SgProjectInfoDO> progress = progressList.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
List<SgProjectInfoDO> over = progressList.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());
@@ -611,4 +616,90 @@
}
+
+ @Override
+ public List<SgProjectTreeVO> projectTree(ProjectSearchDTO dto) {
+ List<String> sgCodeS = getSgCodeByUser();
+ dto.setSgCodeS(sgCodeS);
+ List<SgProjectTreeVO> list = sgProjectInfoMapper.projectTree(dto);
+ if (CollectionUtils.isNotEmpty(list)){
+ // 按省、片区、市、县、乡镇分组
+ Map<String, Map<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>>> groupedProjects = list.stream()
+ .collect(
+ Collectors.groupingBy(SgProjectTreeVO::getProvinceNm,
+ Collectors.groupingBy(SgProjectTreeVO::getLot,
+ Collectors.groupingBy(SgProjectTreeVO::getCityNm,
+ Collectors.groupingBy(SgProjectTreeVO::getCountyNm,
+ Collectors.groupingBy(SgProjectTreeVO::getTownNm
+ ))))));
+ List<SgProjectTreeVO> tree = new ArrayList<>();
+ for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>>> provinceEntry : groupedProjects.entrySet()) {
+ SgProjectTreeVO provinceNode = new SgProjectTreeVO();
+ provinceNode.setProvinceNm(provinceEntry.getKey());
+ provinceNode.setRegionName(provinceEntry.getKey());
+ provinceNode.setId(UUID.randomUUID().toString().replace("-",""));
+ provinceNode.setLevel(1);
+ List<SgProjectTreeVO> provinceChildren = new ArrayList<>();
+ for (Map.Entry<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>> lotEntry : provinceEntry.getValue().entrySet()) {
+ SgProjectTreeVO lotNode = new SgProjectTreeVO();
+ List<String> lotIds = new ArrayList<>();
+ lotNode.setLot(lotEntry.getKey());
+ lotNode.setRegionName(lotEntry.getKey());
+ lotNode.setId(UUID.randomUUID().toString().replace("-",""));
+ lotNode.setLevel(2);
+ List<SgProjectTreeVO> lotChildren = new ArrayList<>();
+ for (Map.Entry<String, Map<String, Map<String, List<SgProjectTreeVO>>>> cityEntry : lotEntry.getValue().entrySet()) {
+ SgProjectTreeVO cityNode = new SgProjectTreeVO();
+ List<String> cityIds = new ArrayList<>();
+ cityNode.setCityNm(cityEntry.getKey());
+ cityNode.setRegionName(cityEntry.getKey());
+ cityNode.setId(UUID.randomUUID().toString().replace("-",""));
+ cityNode.setLevel(3);
+ List<SgProjectTreeVO> cityChildren = new ArrayList<>();
+ for (Map.Entry<String, Map<String, List<SgProjectTreeVO>>> countyEntry : cityEntry.getValue().entrySet()) {
+ SgProjectTreeVO countyNode = new SgProjectTreeVO();
+ List<String> countyIds = new ArrayList<>();
+ countyNode.setCountyNm(countyEntry.getKey());
+ countyNode.setRegionName(countyEntry.getKey());
+ countyNode.setId(UUID.randomUUID().toString().replace("-",""));
+ countyNode.setLevel(4);
+ List<SgProjectTreeVO> countyChildren = new ArrayList<>();
+ for (Map.Entry<String, List<SgProjectTreeVO>> townEntry : countyEntry.getValue().entrySet()) {
+ SgProjectTreeVO townNode = new SgProjectTreeVO();
+ townNode.setTownNm(townEntry.getKey());
+ townNode.setRegionName(townEntry.getKey());
+ townNode.setChildList(townEntry.getValue());
+ townNode.setChildNum((long) townEntry.getValue().size());
+ townNode.setId(UUID.randomUUID().toString().replace("-",""));
+ townNode.setLevel(5);
+ townNode.setProjectIds(townEntry.getValue().stream().map(SgProjectTreeVO::getId).collect(Collectors.toList()));
+ countyIds.addAll(townNode.getProjectIds());
+ countyChildren.add(townNode);
+ }
+ countyNode.setChildNum(countyChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
+ countyNode.setChildList(countyChildren);
+ countyNode.setProjectIds(countyIds);
+ cityIds.addAll(countyIds);
+ cityChildren.add(countyNode);
+ }
+ cityNode.setChildNum(cityChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
+ cityNode.setChildList(cityChildren);
+ cityNode.setProjectIds(cityIds);
+ lotIds.addAll(cityIds);
+ lotChildren.add(cityNode);
+ }
+ lotNode.setChildNum(lotChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
+ lotNode.setChildList(lotChildren);
+ lotNode.setProjectIds(lotIds);
+ provinceChildren.add(lotNode);
+ }
+ provinceNode.setChildNum(provinceChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
+ provinceNode.setChildList(provinceChildren);
+ tree.add(provinceNode);
+ }
+ return tree;
+ }
+ return new ArrayList<>();
+ }
+
}
--
Gitblit v1.9.3