From 422a6cd81396232e4217526d67a2725a82c57990 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 19 Jan 2024 14:32:52 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/ProcessProjectStandardCommon.java       |  1 +
 .../xml/ProcessProjectStandardTermMapper.xml       |  3 +++
 .../service/ProcessProjectStandardService.java     | 14 ++++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java
index fb88aa90..f9a94bac 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java
@@ -5,6 +5,7 @@ package com.jero.modules.activiti.process.projectstandard.common;
  * @date 2024-01-15 17:25
  */
 public class ProcessProjectStandardCommon {
+    public static final String PASS = "pass";
 
     public static final String STANDARDS_ENGINEER = "standardsEngineer";
     public static final String MANAGER_LEADER_LIST = "managerLeaderList";
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 602c542f..1c92e48d 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
@@ -28,6 +28,7 @@
     <result column="responsible_unit_leader" property="responsibleUnitLeader"/>
     <result column="term_user_id" property="termUserId"/>
     <result column="assess_results" property="assessResults"/>
+    <result column="model_series" property="modelSeries"/>
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -67,6 +68,7 @@
       ppstu.id term_user_id,
       ppstu.not_involved,
       ppstu.assess_results,
+      ppstu.model_series,
       ppstu.description,
       ppstu.file_id,
       ppstu.design_engineer
@@ -91,6 +93,7 @@
     ppstu.not_involved,
     ppstu.module_owner,
     ppstu.assess_results,
+    ppstu.model_series,
     ppstu.description,
     ppstu.file_id,
     ppstu.design_engineer
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 fb384be0..0a783eab 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
@@ -408,11 +408,17 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
     private void mkzrrffApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
         Task task = processDTO.getTask();
         String parentExecutionId = task.getFormKey();
-        ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
+        //查询表单
+        ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
+        List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
+        List<String> designEngineerList = termList.stream().map(ProcessProjectStandardTerm::getDesignEngineer).distinct().collect(Collectors.toList());
+
         // 完成任务
+        ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();
-        variables.put(ProcessProjectAssessCommon.PASS, pass);
+        variables.put(ProcessProjectStandardCommon.PASS, pass);
+        variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
         taskService.complete(taskId, variables);
     }
     //部所主管级领导审批
@@ -472,7 +478,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerList.size());
         }
         String taskId = processDTO.getTaskId();
-        variables.put(ProcessProjectAssessCommon.PASS, pass);
+        variables.put(ProcessProjectStandardCommon.PASS, pass);
         taskService.complete(taskId, variables);
     }
     //法规工程师审批
@@ -545,7 +551,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         // 完成任务
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();
-        variables.put(ProcessProjectAssessCommon.PASS, pass);
+        variables.put(ProcessProjectStandardCommon.PASS, pass);
         variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
         variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size());
         taskService.complete(taskId, variables);