From b2d6fc223263a7d12c49450b4a84d3b852e79986 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 19 Jan 2024 16:49:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/ProcessProjectStandardTermMapper.xml  |  5 ----
 .../ProcessProjectStandardService.java        | 27 ++++++++++++++-----
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
index 238b6940..7534f091 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
@@ -107,11 +107,6 @@
   <select id="getByStandardsEngineer" resultMap="BaseResultMap">
     select
     ppstu.id term_user_id,
-    ppstu.not_involved,
-    ppstu.assess_results,
-    ppstu.description,
-    ppstu.file_id,
-    ppstu.design_engineer
     <include refid="Base_Column_List">
       <property name="alias" value="ppst"/>
     </include>
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index e4e5126b..5fed4339 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -146,7 +146,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         //发起人
         LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessProjectStandardTermUser::getProcessId, processId);
-        List<ProcessProjectStandardTermUser> list = new ArrayList<>();
+        List<ProcessProjectStandardTermUser> termUserList = new ArrayList<>();
         switch (taskDefinitionKey) {
             //部所主管级领导下发
             case ProcessProjectStandardCommon.BSZGJLDXF:
@@ -170,18 +170,18 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 processProjectStandardTermList = termMapper.getByModuleOwner(processId, originUserId, executionParentId, false);
                 wrapper.eq(ProcessProjectStandardTermUser::getModuleOwner, originUserId);
                 wrapper.eq(ProcessProjectStandardTermUser::getParentExecutionId, executionParentId);
-                list = termUserService.list(wrapper);
+                termUserList = termUserService.list(wrapper);
                 break;
             //部所主管级领导审批
             case ProcessProjectStandardCommon.BSZGJLDSP_:
                 processProjectStandardTermList = termMapper.getByResponsibleUnitLeader(processId, originUserId, true);
                 wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader, originUserId);
-                list = termUserService.list(wrapper);
+                termUserList = termUserService.list(wrapper);
                 break;
             //法规工程师审批
             case ProcessProjectStandardCommon.FGGCSSP:
                 processProjectStandardTermList = termMapper.getByStandardsEngineer(processId);
-                list = termUserService.list(wrapper);
+                termUserList = termUserService.list(wrapper);
                 break;
             //设计工程师补充工作令编号
             case ProcessProjectStandardCommon.SJGCSBCGZLBH:
@@ -197,7 +197,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
         Map<String, String> assessResultsMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
         //给条款中保存关联的信息
-        Map<String, List<ProcessProjectStandardTermUser>> termIdListMap = CollStreamUtil.groupByKey(list, ProcessProjectStandardTermUser::getTermId);
+        Map<String, List<ProcessProjectStandardTermUser>> termIdListMap = CollStreamUtil.groupByKey(termUserList, ProcessProjectStandardTermUser::getTermId);
         for (ProcessProjectStandardTerm term : processProjectStandardTermList) {
             String termId = term.getId();
             if (termIdListMap.containsKey(termId)) {
@@ -261,7 +261,22 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         processProjectStandardVO.setModuleOwner(moduleOwner1);
         processProjectStandardVO.setProcessProjectStandard(processProjectStandard);
         processProjectStandardVO.setProcessProjectStandardTermList(processProjectStandardTermList);
-        //processProjectStandardVO.setProcessProjectStandardTermUserList();
+        if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){
+            String termId = processProjectStandardTermList.get(0).getId();
+            LambdaQueryWrapper<ProcessProjectStandardTermApproval> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.eq(ProcessProjectStandardTermApproval::getTermId,termId);
+            List<ProcessProjectStandardTermApproval> approvalList = termApprovalService.list(wrapper1);
+            for (ProcessProjectStandardTermApproval termApproval : approvalList) {
+                String responsibleUnitLeader = termApproval.getResponsibleUnitLeader();
+                termApproval.setResponsibleUnitLeader(userNameMap.get(responsibleUnitLeader));
+                String assessResults = termApproval.getAssessResults();
+                termApproval.setAssessResults(assessResultsMap.get(assessResults));
+                String projectApprovalFlag = termApproval.getProjectApprovalFlag();
+                termApproval.setProjectApprovalFlag(YesOrNoEnum.YES.getValue().equals(projectApprovalFlag)?YesOrNoEnum.YES.getName():YesOrNoEnum.NO.getName());
+            }
+            processProjectStandardVO.setProcessProjectStandardTermApprovalList(approvalList);
+
+        }
         processInfoVO.setBusinessInfoDTO(processProjectStandardVO);
         return processInfoVO;
     }