From e531ae4e8ac234beddd21207240d832b50fff70a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 19 Dec 2023 15:39:18 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=20=E9=A9=B3=E5=9B=9E=E5=90=8E=EF=BC=8C=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=B4=9F=E8=B4=A3=E4=BA=BA=20=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=A4=84=E7=90=86=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

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 444d62b2..ec71c225 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
@@ -164,8 +164,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 break;
             //模块负责人审批
             case ProcessProjectAssessCommon.MKFZRSP:
-                //模块负责人修改
-            case ProcessProjectAssessCommon.MKFZRXG:
                 processProjectAssessTermList = processProjectAssessTermService.getByModuleOwner(assessmentId, originUserId, executionParentId);
                 wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId);
                 wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionParentId);
@@ -179,6 +177,21 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                                                 Collectors.joining(",")))
                         );
                 break;
+            //模块负责人修改
+            case ProcessProjectAssessCommon.MKFZRXG:
+                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.getResponsibleUnitLeader());
+                                                },
+                                                Collectors.joining(",")))
+                        );
+                break;
             //设计工程师评估
             case ProcessProjectAssessCommon.SJGCSPG:
             case ProcessProjectAssessCommon.SJGCSPG2:
@@ -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();