From 77cb4e905cd83a057ffbad30776c4a0a9b873c52 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 15 Nov 2024 14:05:42 +0800
Subject: [PATCH] 施工项目：审批详情修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
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 35b18c0..6d5d124 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
@@ -82,11 +82,12 @@
List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -125,11 +126,12 @@
List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -316,8 +318,11 @@
sgProgressReportVO.setDeviceName("");}
List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalOrder).list();
List<Long> ids = list.stream().map(SgReportUserDO::getUserId).collect(Collectors.toList());
+ List<Long> idsCounty = list.stream().filter(s->s.getRoleId().equals(1811657352658042882L)).map(SgReportUserDO::getUserId).collect(Collectors.toList());
List<Long> rids = list.stream().map(SgReportUserDO::getRoleId).collect(Collectors.toList());
List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
+ List<Map<String,Object>> usersCounty = sgProgressReportMapper.getUserByIdsCounty(idsCounty);
+ users.addAll(usersCounty);
List<Map<String,Object>> roles = sgProgressReportMapper.getRoleByIds(rids);
for (Map<String, Object> user : users) {
@@ -589,11 +594,12 @@
List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -736,11 +742,12 @@
List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -781,8 +788,9 @@
searchDTO.setCountryUnit(longList);
}
- if(roleId==1800818489547112450L){
+ if(roleId.equals(1800818489547112450L)){
searchDTO.setSelfUnit(longList);
+
}
}
}
--
Gitblit v1.9.3