From b9c0003c9c1f1f9d51989859f19be013643c20cd Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 12 Jan 2024 15:32:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B):=20=E8=BD=AC=E4=BA=A4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/common/entity/TransferVO.java     |  2 ++
 ...ocessFbStandardConsultationController.java |  2 +-
 ...IProcessFbStandardConsultationService.java |  2 +-
 ...cessFbStandardConsultationServiceImpl.java | 24 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java
index a7063da6..025b7b9c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java
@@ -12,4 +12,6 @@ public class TransferVO {
     String taskId;
 
     String userId;
+
+    String projectId;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java
index 08b13f90..bffcb16a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java
@@ -92,7 +92,7 @@ public class ProcessFbStandardConsultationController extends JeroController<Proc
 	 @ApiOperation(value="标准征求意见流程-转办", notes="标准征求意见流程-转办")
 	 @PostMapping(value = "/transfer")
 	 public Result<T> transfer(@RequestBody TransferVO transferVO) {
-		 processFbStandardConsultationService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+		 processFbStandardConsultationService.transfer(transferVO.getTaskId(), transferVO.getUserId(), transferVO.getProjectId());
 		 return Result.OK();
 	 }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java
index 47a25bdf..e1748482 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java
@@ -49,7 +49,7 @@ public interface IProcessFbStandardConsultationService extends IService<ProcessF
      * @Date: 2023/11/16 15:11
      * @Description: 转办
      **/
-    void transfer(String taskId, String toUserId);
+    void transfer(String taskId, String toUserId, String projectId);
 
     /**
      * @Author: liao
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
index c008ddca..c5f1ee60 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
@@ -308,8 +308,30 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
      * @Description: 转办
      **/
     @Override
-    public void transfer(String taskId, String toUserId) {
+    public void transfer(String taskId, String toUserId, String projectId) {
         processHandleService.transfer(taskId, toUserId);
+        // 模块负责人汇总填写意见
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        String taskDefinitionKey = task.getTaskDefinitionKey();
+        // 设计工程师填写征求意见
+        if (ConsultationTaskKey.DESIGN_ENGINEER_1.equals(taskDefinitionKey)
+                || ConsultationTaskKey.DESIGN_ENGINEER_2.equals(taskDefinitionKey)){
+            processFbConsultationUserLinkService.update(
+                    new LambdaUpdateWrapper<ProcessFbConsultationUserLink>()
+                            .eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
+                            .eq(ProcessFbConsultationUserLink::getDesignEngineerId, CurrentUserUtil.getId())
+                            .set(ProcessFbConsultationUserLink::getDesignEngineerId, toUserId));
+        }
+        // 模块负责人汇总填写意见
+        if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey)
+                || ConsultationTaskKey.MODULE_OWNER_END_2.equals(taskDefinitionKey)
+                || ConsultationTaskKey.MODULE_OWNER_END_3.equals(taskDefinitionKey)){
+            processFbConsultationUserLinkService.update(
+                    new LambdaUpdateWrapper<ProcessFbConsultationUserLink>()
+                            .eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
+                            .eq(ProcessFbConsultationUserLink::getModuleOwnerId, CurrentUserUtil.getId())
+                            .set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId));
+        }
     }
 
     /**