update 项目合规评估流程 各部门主管级领导审批 驳回后，模块负责人 上一节点处理人

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java

@@ -164,6 +164,19 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 break;
             //模块负责人审批
             case ProcessProjectAssessCommon.MKFZRSP:
+                processProjectAssessTermList = processProjectAssessTermService.getByModuleOwner(assessmentId, originUserId, executionParentId);
+                wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId);
+                wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionParentId);
+                processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper);
+                previousNodeHandlerMap = processProjectAssessTermUserList.stream()
+                        .collect(
+                                Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId,
+                                        Collectors.mapping(item -> {
+                                                    return userNameMap.get(item.getDesignEngineer());
+                                                },
+                                                Collectors.joining(",")))
+                        );
+                break;
             //模块负责人修改
             case ProcessProjectAssessCommon.MKFZRXG:
                 processProjectAssessTermList = processProjectAssessTermService.getByModuleOwner(assessmentId, originUserId, executionParentId);
@@ -174,7 +187,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                         .collect(
                                 Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId,
                                         Collectors.mapping(item -> {
-                                                    return userNameMap.get(item.getDesignEngineer());
+                                                    return userNameMap.get(item.getResponsibleUnitLeader());
                                                 },
                                                 Collectors.joining(",")))
                         );
@@ -674,6 +687,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
         String originUserId = processApprovalRecord.getOriginUserId();
         Task task = processDTO.getTask();
+        String formKey = task.getFormKey();
         String executionId = task.getExecutionId();
 
         ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
@@ -686,11 +700,11 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             termUser.setDescription(processProjectAssessTerm.getDescription());
             termUser.setFileId(processProjectAssessTerm.getFileId());
             termUser.setExpectedTime(processProjectAssessTerm.getExpectedTime());
-            termUser.setParentExecutionId(executionId);
+            termUser.setParentExecutionId(formKey);
             allTermUserList.add(termUser);
         }
         processProjectAssessTermUserService.updateBatchById(allTermUserList);
-        tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
+        tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,formKey);
 
         // 完成任务
         String taskId = processDTO.getTaskId();