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-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProgressReportVO.java | 2 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 2 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 57 +++++++++++++---------------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 12 +++++-
4 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProgressReportVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProgressReportVO.java
index 05907b5..89c09cb 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProgressReportVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProgressReportVO.java
@@ -18,4 +18,6 @@
private List<SgStepReportVO> sgStepReportVOS;
private Integer approvalStatus;
+
+ private String stepRemark;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
index 73d8cb5..8b1acca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -44,7 +44,8 @@
re.STATUS as reportStatus,
d.STATUS as deviceStatus,
pro.STATUS as projectStatus,
- re.id as reportId
+ re.id as reportId,
+ pro.lon_lat
FROM
ywxt.sg_project_info pro
LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
@@ -62,12 +63,19 @@
<if test="dto.status != null">
and pro.status = #{dto.status}
</if>
+ <if test="dto.projectIds != null and dto.projectIds.size > 0">
+ and pro.id in
+ <foreach collection="dto.projectIds" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
</select>
<select id="progressList" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
SELECT
pro.id,
pro.project_name,
- pro.lon_lat
+ pro.lon_lat,
+ pro.status
FROM
ywxt.sg_project_info pro where 1=1
<if test="dto.status != null">
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index 61a4b5d..d7de5cf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -152,6 +152,8 @@
public SgProgressReportVO detail(String id) {
SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
+ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(sgProgressReportVO.getGxStepId());
+ sgProgressReportVO.setStepRemark(sgGxStepDO.getRemark());
sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getId).list();
List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
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 16e6114..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
@@ -18,13 +18,11 @@
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;
@@ -82,7 +80,7 @@
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));
@@ -103,7 +101,7 @@
sgDeviceDO.setId(dId);
sgDeviceDO.setDeviceName(deList.get(0).getDeviceName());
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> 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;
@@ -141,14 +139,19 @@
@Override
public List<SgProjectInfoVO> progressList(ProjectSearchDTO searchDTO) {
- List<SgProjectInfoVO> list = sgProjectInfoMapper.progressList(searchDTO);
+ List<SgProjectInfoVO> list = new ArrayList<>();
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.setProgressName(sgProjectInfoDO.getProjectProgress());
- s.setProjectProgressNum(sgProjectInfoDO.getProjectProgressNum());
- });
+ if (CollectionUtils.isNotEmpty(projectProgress)){
+ projectProgress.forEach(s->{
+ SgProjectInfoVO sgProjectInfoVO = new SgProjectInfoVO();
+ 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;
}
@@ -161,11 +164,14 @@
@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));
- Map<Long, String> progressMap = projectProgress.stream().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()));
- });
+ });}
return page.setRecords(list);
}
@@ -189,24 +195,13 @@
@Override
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();
- 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());
-
List<SgProjectInfoVO> progressList = progressList(searchDTO);
- BigDecimal reduce = progressList.stream().map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);
+ 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);
- map.put("all", list.size());
+ 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());
--
Gitblit v1.9.3