From 42968703ee1ce4e34991bc0f1e189d2245cbd600 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 05 Sep 2024 19:27:26 +0800
Subject: [PATCH] 湖北水库：项目统计加上标段字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 df3110b..ef0f549 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,7 +289,7 @@
@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);
@@ -298,7 +298,7 @@
List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
searchDTO.setProjectIds(ids);
List<SgProjectInfoDO> projectProgress = new ArrayList<>();
- if(!searchDTO.getAdCode().isEmpty()){
+ if(StringUtils.isNotBlank(searchDTO.getAdCode())){
projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
}else {
projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
@@ -560,7 +560,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());
@@ -613,8 +613,9 @@
@Override
- public List<SgProjectTreeVO> projectTree() {
- List<SgProjectTreeVO> list = sgProjectInfoMapper.projectTree();
+ public List<SgProjectTreeVO> projectTree(ProjectSearchDTO dto) {
+ List<SgProjectTreeVO> list = sgProjectInfoMapper.projectTree(dto);
+ if (CollectionUtils.isNotEmpty(list)){
// 按省、市、县分组
Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>> groupedProjects = list.stream()
.collect(Collectors.groupingBy(SgProjectTreeVO::getProvinceNm,
@@ -629,8 +630,10 @@
SgProjectTreeVO provinceNode = new SgProjectTreeVO();
provinceNode.setProvinceNm(province);
+ provinceNode.setId(UUID.randomUUID().toString().replace("-",""));
+ provinceNode.setRegionName(province);
provinceNode.setChildList(new ArrayList<>());
-
+ long provinceNum = 0;
for (Map.Entry<String, Map<String, List<SgProjectTreeVO>>> cityEntry : cityMap.entrySet()) {
String city = cityEntry.getKey();
Map<String, List<SgProjectTreeVO>> countyMap = cityEntry.getValue();
@@ -638,14 +641,20 @@
SgProjectTreeVO cityNode = new SgProjectTreeVO();
List<String> cityIds = new ArrayList<>();
cityNode.setCityNm(city);
+ cityNode.setId(UUID.randomUUID().toString().replace("-",""));
+ cityNode.setRegionName(city);
cityNode.setChildList(new ArrayList<>());
for (Map.Entry<String, List<SgProjectTreeVO>> countyEntry : countyMap.entrySet()) {
String county = countyEntry.getKey();
List<SgProjectTreeVO> countyProjects = countyEntry.getValue();
-
+ for (SgProjectTreeVO countyProject : countyProjects) {
+ countyProject.setRegionName(countyProject.getResNm());
+ }
SgProjectTreeVO countyNode = new SgProjectTreeVO();
countyNode.setCountyNm(county);
+ countyNode.setRegionName(county);
+ countyNode.setId(UUID.randomUUID().toString().replace("-",""));
countyNode.setChildList(new ArrayList<>(countyProjects));
countyNode.setChildNum((long) countyProjects.size());
countyNode.setProjectIds(countyProjects.stream().map(SgProjectTreeVO::getId).collect(Collectors.toList()));
@@ -653,15 +662,18 @@
cityNode.getChildList().add(countyNode);
}
- cityNode.setChildNum((long) cityNode.getChildList().size());
+ cityNode.setChildNum((long) cityIds.size());
cityNode.setProjectIds(cityIds);
provinceNode.getChildList().add(cityNode);
+ provinceNum+= (long) cityIds.size();
}
- provinceNode.setChildNum((long) provinceNode.getChildList().size());
+ provinceNode.setChildNum(provinceNum);
result.add(provinceNode);
}
return result;
+ }
+ return new ArrayList<>();
}
}
--
Gitblit v1.9.3