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 | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 d7ce505..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
@@ -295,20 +295,25 @@
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(StringUtils.isNotBlank(searchDTO.getAdCode())){
- 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);
}
--
Gitblit v1.9.3