From caf24ff51f39e8026cd1f6d15b8258a6bdc3d997 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 11:35:33 +0800
Subject: [PATCH] 修改我的审核和代办数量流程逻辑
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 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 b3be869..d236472 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
@@ -72,14 +72,33 @@
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageList(page,searchDTO);
if(list != null){
list.forEach(s ->{
- Long proframId = s.getProframId();
- SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
- String controlUnit = sgProjectInfoDO.getControlUnit();
- List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
- String selfUnit = sgProjectInfoDO.getSelfUnit();
- List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
- users.addAll(selfUnitusers);
- s.setUserIDs(users);
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
});
}
@@ -90,14 +109,33 @@
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(page,searchDTO);
if(list != null){
list.forEach(s ->{
- Long proframId = s.getProframId();
- SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
- String controlUnit = sgProjectInfoDO.getControlUnit();
- List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
- String selfUnit = sgProjectInfoDO.getSelfUnit();
- List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
- users.addAll(selfUnitusers);
- s.setUserIDs(users);
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
});
}
--
Gitblit v1.9.3