From f7beae39603d6a1ea76da6b0b757906b2a2932cc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 28 Jun 2024 12:00:09 +0800
Subject: [PATCH] 湖北水库：施工：项目进度列表修复
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 173 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 124 insertions(+), 49 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 163d8e1..472fd06 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
@@ -7,6 +7,7 @@
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.VO.SgProjectInfoVO;
import cn.gistack.sm.sg.VO.SgTypeVO;
+import cn.gistack.sm.sg.excel.ProjectExcel;
import cn.gistack.sm.sg.mapper.SgProjectInfoMapper;
import cn.gistack.sm.sg.service.SgProjectInfoService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,15 +15,15 @@
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;
+import org.springframework.util.StopWatch;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -40,23 +41,46 @@
@Override
public IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(page,searchDTO);
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ if (CollectionUtils.isNotEmpty(projectProgress)){
+ Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
+ sgProjectInfoDOS.forEach(s->{
+ s.setProjectProgress(progressMap.get(s.getId()));
+ });
+ }
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<>();
for (Map.Entry<Long, List<SgProjectInfoVO>> entry : projectMap.entrySet()) {
+ List<SgDeviceDO> allDevice = new ArrayList<>();
Long porId = entry.getKey();
List<SgProjectInfoVO> value = entry.getValue();
if (CollectionUtils.isEmpty(value)){
continue;
}
SgProjectInfoVO sgProjectInfoVO = value.get(0);
- SgProjectInfoDO sgProjectInfoDO = SgProjectInfoDO.builder().id(porId).status(sgProjectInfoVO.getProjectStatus()).projectName(sgProjectInfoVO.getProjectName()).build();
+ SgProjectInfoDO sgProjectInfoDO = SgProjectInfoDO.builder().id(porId).lonLat(sgProjectInfoVO.getLonLat()).status(sgProjectInfoVO.getProjectStatus()).projectName(sgProjectInfoVO.getProjectName()).build();
List<SgTypeVO> sgGxDOS = new ArrayList<>();
//类型分组
Map<String, List<SgProjectInfoVO>> GxMap = value.stream().filter(s->s.getDeviceType()!=null).collect(Collectors.groupingBy(SgProjectInfoVO::getDeviceType));
@@ -77,13 +101,37 @@
sgDeviceDO.setId(dId);
sgDeviceDO.setDeviceName(deList.get(0).getDeviceName());
sgDeviceDO.setStatus( deList.get(0).getDeviceStatus());
- sgDeviceDO.setStepDOList(deList.stream().map(s->SgGxStepDO.builder().id(s.getReportId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList()));
+ List<SgGxStepDO> stepDOS = deList.stream().filter(s->s.getReportStatus()==null || s.getReportStatus()!=4).map(s -> SgGxStepDO.builder().id(s.getStepId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList());
+ List<SgGxStepDO> stepOver = stepDOS.stream().filter(s -> s.getApprovalStatus() != null && s.getApprovalStatus() == 2).collect(Collectors.toList());
+ BigDecimal stepSize = BigDecimal.valueOf(stepDOS.size());
+ BigDecimal stepOverSize = BigDecimal.ZERO;
+ if (!stepOver.isEmpty()){
+ stepOverSize = BigDecimal.valueOf(stepOver.size());
+ }
+ BigDecimal divide = stepOverSize.divide(stepSize, 2, RoundingMode.HALF_UP);
+ sgDeviceDO.setProgress(divide.toString());
+ sgDeviceDO.setDeviceProgress(getBigDecimalPercent(divide));
+ sgDeviceDO.setStepDOList(stepDOS);
deviceDOS.add(sgDeviceDO);
+ allDevice.add(sgDeviceDO);
}
+ BigDecimal deviceSize = BigDecimal.valueOf(deviceDOS.size());
+ double sum = deviceDOS.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum();
+ BigDecimal deviceOver = BigDecimal.valueOf(sum);
+ BigDecimal divideDevice = deviceOver.divide(deviceSize, 2, RoundingMode.HALF_UP);
typeVO.setDeviceDOS(deviceDOS);
+ typeVO.setTypeProgress(getBigDecimalPercent(divideDevice));
sgGxDOS.add(typeVO);
}
- sgProjectInfoDO.setSgGxDOS(sgGxDOS);
+ BigDecimal allDeviceSize = BigDecimal.valueOf(allDevice.size());
+ if (!allDeviceSize.equals(BigDecimal.ZERO)){
+ double sum = allDevice.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum();
+ BigDecimal allDeviceOver = BigDecimal.valueOf(sum);
+ BigDecimal allDivideDevice = allDeviceOver.divide(allDeviceSize, 2, RoundingMode.HALF_UP);
+ sgProjectInfoDO.setSgGxDOS(sgGxDOS);
+ sgProjectInfoDO.setProjectProgress( getBigDecimalPercent(allDivideDevice));
+ sgProjectInfoDO.setProjectProgressNum(allDivideDevice);
+ }
result.add(sgProjectInfoDO);
}
return result;
@@ -91,52 +139,79 @@
@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()) {
+ List<SgProjectInfoVO> list = new ArrayList<>();
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ if (CollectionUtils.isNotEmpty(projectProgress)){
+ projectProgress.forEach(s->{
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());
- BigDecimal percentage = v1.divide(v2,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
- // 如果不需要保留小数位，可以设置一个scale为0
- BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
- sgProjectInfoVO.setProgressName(percentageRounded+"%");
- result.add(sgProjectInfoVO);
- }
- return result;
+ sgProjectInfoVO.setId(s.getId());
+ sgProjectInfoVO.setProjectName(s.getProjectName());
+ sgProjectInfoVO.setProjectProgress(s.getProjectProgress());
+ sgProjectInfoVO.setLonLat(s.getLonLat());
+ sgProjectInfoVO.setProjectProgressNum(s.getProjectProgressNum());
+ sgProjectInfoVO.setStatus(s.getStatus());
+ list.add(sgProjectInfoVO);
+ });}
+ 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<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
+ searchDTO.setProjectIds(ids);
+ List<SgProjectInfoDO> 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));
+ list.forEach(s->{
+ s.setProjectProgress(progressMap.get(s.getId()));
+ });}
+ return page.setRecords(list);
}
@Override
- public Map<String, Long> projectCount(ProjectSearchDTO searchDTO) {
- Map<String, Long> map = new HashMap<>();
- LambdaQueryChainWrapper<SgProjectInfoDO> wrapper = new LambdaQueryChainWrapper<>(sgProjectInfoMapper);
- String projectName = searchDTO.getProjectName();
- Integer status = searchDTO.getStatus();
- if (StringUtils.isNotBlank(projectName)){
- wrapper.like(SgProjectInfoDO::getProjectName,searchDTO.getProjectName());
- }
- if (status!=null){
- wrapper.eq(SgProjectInfoDO::getStatus,searchDTO.getStatus());
- }
- List<SgProjectInfoDO> list = wrapper.list();
- 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());
+ public List<SgProjectInfoDO> listAll(ProjectSearchDTO searchDTO) {
+ return sgProjectInfoMapper.queryPageList(null,searchDTO);
+ }
+
+ /**
+ * 获取百分比
+ * @param bigDecimal
+ * @return
+ */
+ private String getBigDecimalPercent(BigDecimal bigDecimal) {
+ BigDecimal percentage = bigDecimal.multiply(new BigDecimal("100"));
+ // 如果不需要保留小数位，可以设置一个scale为0
+ BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
+ return percentageRounded+"%";
+ }
+
+ @Override
+ public Map<String, Object> projectCount(ProjectSearchDTO searchDTO) {
+ 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);
+ 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());
+ map.put("all", progressList.size());
+ map.put("pending", pending.size());
+ map.put("progress", progress.size());
+ map.put("over", over.size());
+ map.put("projectProgress", getBigDecimalPercent(divide));
return map;
}
+
+ @Override
+ public void importProject(List<ProjectExcel> data, Boolean isCovered) {
+
+ }
+
}
--
Gitblit v1.9.3