From 94ba87b94f482a01324b226e743b8bf022686f61 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 11 Jan 2024 17:44:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080493=20=E4=BC=81=E6=A0=87=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B--=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=9A=84=E4=B8=BB=E8=B5=B7=E8=8D=89=E9=83=A8=E9=97=A8=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E6=B2=A1=E5=8F=96=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/ProcessESRevisionEndListener.java         |  4 +---
 .../esRevision/service/impl/EsRevisionServiceImpl.java | 10 +++++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
index edfca12c..68e11735 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
@@ -21,8 +21,6 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingR
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService;
 import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
 import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
-import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
-import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.tag.enums.TableNameEnum;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
@@ -30,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -95,6 +92,7 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
         variables.put(FieldCommon.COMP_ILLUSTRATION, data.getCompIllustration());
         variables.put(FieldCommon.RELEASE_DATE, data.getReleaseDate());
         variables.put(FieldCommon.IMPLEMENTATION_DATE, data.getImplementDate());
+        variables.put(FieldCommon.MAIN_DRAFTING_UNIT_RESPONSIBLE_PERSON, data.getApprovalUser());
         variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue());
         String standardId = IdWorker.getIdStr();
         variables.put(FieldCommon.ID, standardId);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 01a8d0fd..dfc64d22 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -248,7 +248,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         Object passObject = taskService.getVariable(taskId, "pass");
         boolean pass = true;
         if (passObject != null) {
-             pass = (boolean) passObject;
+            pass = (boolean) passObject;
         }
         // 某些节点需要对数据进行特殊处理
         switch (xmlNodeId) {
@@ -550,6 +550,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             throw new JeroBootException("转办人不能为空");
         }
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        String processInstanceId = task.getProcessInstanceId();
         // 获取执行id
         String executionId = task.getExecutionId();
         // 获取当前节点的id
@@ -571,6 +572,13 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 runtimeService.setVariable(executionId, "contactUserLeader", toUserId);
                 runtimeService.setVariable(executionId, executionId + "-ContactUserLeader", toUserId);
                 break;
+            case LEADER_APPROVAL:
+                // 根据流程实例Id修改审批人字段
+                runtimeService.setVariable(executionId, "contactUserLeader", toUserId);
+                LambdaUpdateWrapper<ProcessEsRevision> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId)
+                            .set(ProcessEsRevision::getApprovalUser, toUserId);
+                update(updateWrapper);
         }
         processHandleService.transfer(taskId, toUserId);
     }