From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 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 964cc63..163d8e1 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
@@ -11,11 +11,16 @@
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;
@@ -50,7 +55,8 @@
if (CollectionUtils.isEmpty(value)){
continue;
}
- SgProjectInfoDO sgProjectInfoDO = SgProjectInfoDO.builder().id(porId).projectName(value.get(0).getProjectName()).build();
+ 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));
@@ -70,7 +76,8 @@
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());
+ 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()));
deviceDOS.add(sgDeviceDO);
}
typeVO.setDeviceDOS(deviceDOS);
@@ -81,4 +88,55 @@
}
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());
+ 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;
+ }
+
+ @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;
+ }
}
--
Gitblit v1.9.3