From 9dee3a93c59d33d1ed9e7ef871408e869c49a9de Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 18 Jan 2024 14:16:57 +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-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/ProcessProjectStandardTermMapper.xml  |  8 ++---
 .../ProcessProjectStandardService.java        | 30 ++++++++++++++-----
 2 files changed, 26 insertions(+), 12 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 39dce910..42398a1e 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
@@ -39,7 +39,7 @@
     <select id="getByResponsibleUnitLeader" resultMap="BaseResultMap">
       select
       <include refid="Base_Column_List">
-        <property name="alias" value="ppat"/>
+        <property name="alias" value="ppst"/>
       </include>
       ,
         ppstu.id term_user_id,
@@ -61,7 +61,7 @@
   <select id="getByModuleOwner" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List">
-      <property name="alias" value="ppat"/>
+      <property name="alias" value="ppst"/>
     </include>
     ,
       ppstu.id term_user_id,
@@ -84,7 +84,7 @@
   <select id="getByDesignEngineer" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List">
-      <property name="alias" value="ppat"/>
+      <property name="alias" value="ppst"/>
     </include>
     ,
     ppstu.id term_user_id,
@@ -105,7 +105,7 @@
   <select id="getByStandardsEngineer" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List">
-      <property name="alias" value="ppat"/>
+      <property name="alias" value="ppst"/>
     </include>
     ,
     ppstu.id term_user_id,
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 cb300e65..9dbeead3 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
@@ -175,7 +175,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             //法规工程师审批
             case ProcessProjectStandardCommon.FGGCSSP:
                 processProjectStandardTermList = termMapper.getByStandardsEngineer(processId);
-
+                list = termUserService.list(wrapper);
                 break;
             //设计工程师补充工作令编号
             case ProcessProjectStandardCommon.SJGCSBCGZLBH:
@@ -196,8 +196,10 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 String assessResults = AssessCommon.NOT_INVOLVED;
                 String projectApprovalFlag = YesOrNoEnum.NO.getValue();
                 List<String> moduleOwnerList = new ArrayList<>();
+                List<String> responsibleUnitLeaderList = new ArrayList<>();
                 for (ProcessProjectStandardTermUser termUser : termUsers) {
                     moduleOwnerList.add(termUser.getModuleOwner());
+                    responsibleUnitLeaderList.add(termUser.getResponsibleUnitLeader());
                     String assessResults1 = termUser.getAssessResults();
                     if (AssessCommon.NOT_COMPLIANT.equals(assessResults1)) {
                         assessResults = AssessCommon.NOT_COMPLIANT;
@@ -209,13 +211,25 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                         projectApprovalFlag = YesOrNoEnum.YES.getValue();
                     }
                 }
-                List<String> userNameList = new ArrayList<>();
-                moduleOwnerList.stream()
-                        .filter(Objects::nonNull)
-                        .distinct().forEach(i ->{
-                            userNameList.add(userNameMap.get(i)) ;
-                        });
-                term.setModuleOwner(String.join(",", userNameList));
+                if (ProcessProjectStandardCommon.BSZGJLDSP_.equals(taskDefinitionKey)){
+                    List<String> userNameList = new ArrayList<>();
+                    moduleOwnerList.stream()
+                            .filter(Objects::nonNull)
+                            .distinct().forEach(i ->{
+                                userNameList.add(userNameMap.get(i)) ;
+                            });
+                    term.setModuleOwner(String.join(",", userNameList));
+                }
+                if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){
+                    List<String> userNameList = new ArrayList<>();
+                    responsibleUnitLeaderList.stream()
+                            .filter(Objects::nonNull)
+                            .distinct().forEach(i ->{
+                                userNameList.add(userNameMap.get(i)) ;
+                            });
+                    term.setResponsibleUnitLeader(String.join(",", userNameList));
+                }
+
                 term.setProjectApprovalFlag(projectApprovalFlag);
                 term.setAssessResults(assessResults);
                 term.setAssessResults_dictText(assessResultsMap.get(assessResults));