From f70eb18b434aa7f30fd25b0d5e455e66aab516d9 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 6 Dec 2023 17:03:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E9=A9=B3=E5=9B=9E=E5=90=8E=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=8D=E6=AD=A3=E7=A1=AEBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/CounterSignNodeNameConstants.java     |  3 +++
 .../impl/ProcessEsInitChangeServiceImpl.java     | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java
index 762d5fd7..cda9d962 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java
@@ -10,4 +10,7 @@ public class CounterSignNodeNameConstants {
 
     public static final String ES_CHANGE_COUNTER_SIGN_NODE_NAME = "相关人员校对";
 
+    public static final String ES_INIT_CHANGE_EXPERT_NODE_NAME = "专家审批";
+
+
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 34032601..67369a77 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -9,6 +9,7 @@ import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
+import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
@@ -23,7 +24,9 @@ import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,6 +57,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     @Resource
     private RuntimeService runtimeService;
 
+    @Resource
+    private TaskService taskService;
 
     @Override
     public void startProcess(InitChangeDataVO initChangeData) {
@@ -175,6 +180,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         }
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        String taskName = task.getName();
         if (pass) {
             if (initChangeList != null) {
                 saveOrUpdateBatch(initChangeList);
@@ -195,6 +202,15 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         actFlowCommonService.completeTask(taskId, userId);
         // 删除草稿
         actFlowCommonService.removeDraft(commonVO);
+        if (!pass) {
+            // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
+            if (taskName.equals(CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME)) {
+                actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME);
+            }
+            if (taskName.equals(CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME)) {
+                actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
+            }
+        }
     }
 
     @Override