From d6b704980cd4a841eb8b58b924adfc99122c80eb Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 25 Jun 2024 11:58:51 +0800
Subject: [PATCH] 湖北水库：施工：施工项目导入
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 122 ++++++++++++++++++++++++++++++++++++----
1 files changed, 110 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 9311e59..f59edac 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
@@ -6,15 +6,22 @@
import cn.gistack.sm.sg.DO.SgProjectInfoDO;
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;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+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.stream.Collectors;
@@ -44,22 +51,24 @@
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;
}
- SgProjectInfoDO sgProjectInfoDO = SgProjectInfoDO.builder().id(porId).projectName(value.get(0).getProjectName()).build();
- List<SgGxDO> sgGxDOS = new ArrayList<>();
- //工序分组
- Map<Long, List<SgProjectInfoVO>> GxMap = value.stream().filter(s->s.getGxId()!=null).collect(Collectors.groupingBy(SgProjectInfoVO::getGxId));
- for (Map.Entry<Long, List<SgProjectInfoVO>> gx : GxMap.entrySet()) {
- Long gxId = gx.getKey();
- List<SgProjectInfoVO> gxList = gx.getValue();
+ SgProjectInfoVO sgProjectInfoVO = value.get(0);
+ SgProjectInfoDO sgProjectInfoDO = SgProjectInfoDO.builder().id(porId).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));
+ for (Map.Entry<String, List<SgProjectInfoVO>> ty : GxMap.entrySet()) {
+ String type = ty.getKey();
+ List<SgProjectInfoVO> gxList = ty.getValue();
if (CollectionUtils.isEmpty(gxList)){
continue;
}
- SgGxDO gxDO = SgGxDO.builder().id(gxId).gxName(gxList.get(0).getGxName()).build();
+ SgTypeVO typeVO = SgTypeVO.builder().typeName(gxList.get(0).getTypeName()).build();
List<SgDeviceDO> deviceDOS = new ArrayList<>();
//设备分组
Map<Long, List<SgProjectInfoVO>> dMap = gxList.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getDId));
@@ -69,15 +78,104 @@
SgDeviceDO sgDeviceDO = new SgDeviceDO();
sgDeviceDO.setId(dId);
sgDeviceDO.setDeviceName(deList.get(0).getDeviceName());
- sgDeviceDO.setStepDOList(deList.stream().map(s->SgGxStepDO.builder().gxStepName(s.getGxStepName()).approvalStatus(s.getSTATUS()).build()).collect(Collectors.toList()));
+ sgDeviceDO.setStatus( deList.get(0).getDeviceStatus());
+ List<SgGxStepDO> stepDOS = deList.stream().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);
}
- gxDO.setDeviceDOS(deviceDOS);
- sgGxDOS.add(gxDO);
+ 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));
+ }
result.add(sgProjectInfoDO);
}
return result;
}
+
+ @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;
+ }
+
+ /**
+ * 获取百分比
+ * @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, 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());
+ return map;
+ }
+
+ @Override
+ public void importProject(List<ProjectExcel> data, Boolean isCovered) {
+
+ }
}
--
Gitblit v1.9.3