From 61aaf1d26463b8bdff8ddaa90228f26042fbf5b2 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 25 Jun 2024 17:35:16 +0800
Subject: [PATCH] 湖北水库：施工：项目进度列表分页
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 79 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 26 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 f59edac..20e4770 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
@@ -15,6 +15,7 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,6 +25,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -44,9 +46,24 @@
return page.setRecords(sgProjectInfoDOS);
}
+ /**
+ * 获取项目及项目下设备及设备下工序进度
+ * @param searchDTO
+ * @return
+ */
@Override
public List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO) {
List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject( searchDTO);
+ return getProjectProgress(list);
+ }
+
+ /**
+ * 获取项目进度
+ * @param list
+ * @return
+ */
+ @NotNull
+ private List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) {
//项目分组
Map<Long, List<SgProjectInfoVO>> projectMap = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
List<SgProjectInfoDO> result = new ArrayList<>();
@@ -108,6 +125,7 @@
BigDecimal allDivideDevice = allDeviceOver.divide(allDeviceSize, 2, RoundingMode.HALF_UP);
sgProjectInfoDO.setSgGxDOS(sgGxDOS);
sgProjectInfoDO.setProjectProgress( getBigDecimalPercent(allDivideDevice));
+ sgProjectInfoDO.setProjectProgressNum(allDivideDevice);
}
result.add(sgProjectInfoDO);
}
@@ -117,28 +135,32 @@
@Override
public List<SgProjectInfoVO> progressList(ProjectSearchDTO searchDTO) {
List<SgProjectInfoVO> list = sgProjectInfoMapper.progressList(searchDTO);
- Map<Long, List<SgProjectInfoVO>> map = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
- List<SgProjectInfoVO> result = new ArrayList<>();
- for (Map.Entry<Long, List<SgProjectInfoVO>> entry : map.entrySet()) {
- SgProjectInfoVO sgProjectInfoVO = new SgProjectInfoVO();
- List<SgProjectInfoVO> deviceList = entry.getValue();
- if (CollectionUtils.isEmpty(deviceList)){
- continue;
- }
- sgProjectInfoVO.setId(entry.getKey());
- sgProjectInfoVO.setProjectName(deviceList.get(0).getProjectName());
- List<SgProjectInfoVO> overList = deviceList.stream().filter(s->s.getDeviceStatus()!=null).filter(s -> s.getDeviceStatus() == 2).collect(Collectors.toList());
- BigDecimal v1 =BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(overList)){
- v1 = BigDecimal.valueOf(overList.size());
- }
- BigDecimal v2 = BigDecimal.valueOf(deviceList.size());
- sgProjectInfoVO.setProgressName(getBigDecimalPercent( v1.divide(v2,2,BigDecimal.ROUND_HALF_UP)));
- result.add(sgProjectInfoVO);
- }
- return result;
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ Map<Long, SgProjectInfoDO> progressMap = projectProgress.stream().collect(Collectors.toMap(SgProjectInfoDO::getId, Function.identity()));
+ list.forEach(s->{
+ SgProjectInfoDO sgProjectInfoDO = progressMap.get(s.getId());
+ s.setProjectProgress(sgProjectInfoDO.getProjectProgress());
+ s.setProjectProgressNum(sgProjectInfoDO.getProjectProgressNum());
+ });
+ return list;
}
+ /**
+ * 项目进度列表（分页）
+ * @param page
+ * @param searchDTO
+ * @return
+ */
+ @Override
+ public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
+ List<SgProjectInfoVO> list = sgProjectInfoMapper.progressList(page, searchDTO);
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ Map<Long, String> progressMap = projectProgress.stream().collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
+ list.forEach(s->{
+ s.setProjectProgress(progressMap.get(s.getId()));
+ });
+ return page.setRecords(list);
+ }
/**
* 获取百分比
* @param bigDecimal
@@ -152,8 +174,8 @@
}
@Override
- public Map<String, Long> projectCount(ProjectSearchDTO searchDTO) {
- Map<String, Long> map = new HashMap<>();
+ public Map<String, Object> projectCount(ProjectSearchDTO searchDTO) {
+ Map<String, Object> map = new HashMap<>();
LambdaQueryChainWrapper<SgProjectInfoDO> wrapper = new LambdaQueryChainWrapper<>(sgProjectInfoMapper);
String projectName = searchDTO.getProjectName();
Integer status = searchDTO.getStatus();
@@ -167,10 +189,14 @@
List<SgProjectInfoDO> pending = list.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
List<SgProjectInfoDO> progress = list.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
List<SgProjectInfoDO> over = list.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());
- map.put("all", (long) list.size());
- map.put("pending", (long) pending.size());
- map.put("progress", (long) progress.size());
- map.put("over", (long) over.size());
+
+ List<SgProjectInfoVO> progressList = progressList(searchDTO);
+ BigDecimal reduce = progressList.stream().map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);
+ map.put("all", list.size());
+ map.put("pending", pending.size());
+ map.put("progress", progress.size());
+ map.put("over", over.size());
+ map.put("projectProgress", getBigDecimalPercent(reduce));
return map;
}
@@ -178,4 +204,5 @@
public void importProject(List<ProjectExcel> data, Boolean isCovered) {
}
+
}
--
Gitblit v1.9.3