From 2d0c7df13ca1a75226b49a10f9552873575836e7 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Wed, 19 Jun 2024 17:06:54 +0800
Subject: [PATCH] 湖北水库：施工：修复工序创建人展示ID问题、修复项目整体流程状态问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java
index 52d5fbb..2e267eb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java
@@ -2,9 +2,11 @@
import cn.gistack.sm.sg.DO.SgGxDO;
import cn.gistack.sm.sg.DO.SgGxStepDO;
+import cn.gistack.sm.sg.DO.SgReportUserDO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.VO.SgGxVO;
import cn.gistack.sm.sg.mapper.SgGxMapper;
+import cn.gistack.sm.sg.mapper.SgProgressReportMapper;
import cn.gistack.sm.sg.service.SgGxService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -29,15 +31,25 @@
public class SgGxServiceImpl extends ServiceImpl<SgGxMapper, SgGxDO> implements SgGxService {
@Autowired
private SgGxMapper sgGxMapper;
+
+ @Autowired
+ private SgProgressReportMapper sgProgressReportMapper;
@Override
public IPage<SgGxVO> queryPageList(IPage<SgGxVO> page, ProjectSearchDTO searchDTO) {
List<SgGxVO> list = sgGxMapper.queryPageList(page,searchDTO);
if (CollectionUtils.isNotEmpty(list)){
List<Long> ids = list.stream().map(SgGxDO::getId).collect(Collectors.toList());
+ List<Long> userIds = list.stream().map(SgGxDO::getCreateUser).collect(Collectors.toList());
+ List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(userIds);
List<SgGxStepDO> stepDOS = sgGxMapper.queryStepByIds(ids);
if (CollectionUtils.isNotEmpty(stepDOS)){
Map<Long, List<SgGxStepDO>> map = stepDOS.stream().collect(Collectors.groupingBy(SgGxStepDO::getGxInfoId));
for (SgGxVO sgGxDO : list) {
+ for (Map<String, Object> user : users) {
+ if (user.get("ID").equals(sgGxDO.getCreateUser())){
+ sgGxDO.setCreateUserName(user.get("REAL_NAME").toString());
+ }
+ }
List<SgGxStepDO> sgGxStepDOS = map.get(sgGxDO.getId());
if (CollectionUtils.isNotEmpty(sgGxStepDOS)){
sgGxDO.setStepDOList(sgGxStepDOS);
--
Gitblit v1.9.3