From 44b11b018212631c293dc17c07a152cdfeaf726e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 10 Jan 2024 18:06:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080128=20=E6=A8=A1=E5=9D=97=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E5=AE=A1=E6=89=B9=E5=92=8C=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=BF=AE=E6=94=B9=20=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E8=AF=84=E4=BC=B0=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/ProcessProjectAssessTermMapper.xml    |  4 +++-
 .../service/ProcessProjectAssessService.java  | 20 +++++++++----------
 .../service/ProcessProjectNotMetService.java  |  7 +++++++
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml
index ce4e19d2..48731321 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml
@@ -73,7 +73,9 @@
           <property name="alias" value="ppat"/>
       </include>
       ,
-      ppatu.id term_user_id
+      ppatu.id term_user_id,
+      ppatu.design_engineer,
+      ppatu.module_owner
       from process_project_assess_term ppat
                left join process_project_assess_term_user ppatu on ppat.id = ppatu.term_id
       where ppat.assessment_id = #{assessmentId}
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index 5a1857e8..a6752cc3 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
@@ -863,12 +863,13 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             termUser.setExpectedTime(processProjectAssessTerm.getExpectedTime());
             termUser.setRiskPoints(processProjectAssessTerm.getRiskPoints());
             termUser.setValidateSolution(processProjectAssessTerm.getValidateSolution());
-            termUser.setParentExecutionId(formKey);
+            termUser.setParentExecutionId(executionId);
             termUser.setAssessTime(date);
+
             allTermUserList.add(termUser);
         }
         processProjectAssessTermUserService.updateBatchById(allTermUserList);
-        tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,formKey);
+        tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
 
         // 完成任务
         String taskId = processDTO.getTaskId();
@@ -877,17 +878,16 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
 
 
     public void saveToDraft(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
-        ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
-        if (businessInfoDTO != null) {
-            ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess();
-            if (processProjectAssess != null) {
-                processInfoVO.setBusinessId(processProjectAssess.getId());
-            }
-        }
-
         // 流程信息
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_ASSESS.getValue()); // 流程类型
+        //保存businessId
+        String processInstanceId = basicProcessInfoDTO.getProcessInstanceId();
+        if (StringUtils.isNotBlank(processInstanceId)){
+            ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
+            String projectId = processAll.getProjectId();
+            processInfoVO.setBusinessId(projectId);
+        }
 
         processHandleService.saveToDraft(processInfoVO);
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
index 89a698b7..6c7c9b5c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
@@ -299,6 +299,13 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         }
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型
         processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO);
+        //保存businessId
+        String processInstanceId = basicProcessInfoDTO.getProcessInstanceId();
+        if (StringUtils.isNotBlank(processInstanceId)){
+            ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
+            String projectId = processAll.getProjectId();
+            processInfoVO.setBusinessId(projectId);
+        }
 
         processHandleService.saveToDraft(processInfoVO);
     }