fix 80128 模块负责人审批和模块负责人修改 回显评估人

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}

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);
     }

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);
     }