From 6640262326fea915bdb6b44eafbf7c2cbeee2be4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 26 Jan 2024 11:29:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=90=8E=E4=BF=AE=E8=AE=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsInitChangeServiceImpl.java      | 15 ++++++++++-----
 .../listener/ProcessESRecheckEndListener.java     |  9 ---------
 2 files changed, 10 insertions(+), 14 deletions(-)

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 ff04bf64..4c3d87da 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
@@ -43,6 +43,7 @@ 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.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -221,16 +222,20 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         // 保存选人信息
         // 人员
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, variables);
-        // 获取第一个任务的taskId
-        String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, mainDraftUser, processDefinitionId);
-        // 手动翻译
-        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(variables));
-        // 强制撤回
+        // 创建相应数据
         CommonVO commonVO = new CommonVO();
         commonVO.setPrcName(prcName);
         commonVO.setPrcMes(null);
         commonVO.setDueTime(null);
         commonVO.setProcessInstanceId(processInstanceId);
+        InitChangeDataVO initChangeDataVO = new InitChangeDataVO();
+        initChangeDataVO.setDataList(Collections.singletonList(initChange));
+        initChangeDataVO.setCommonVO(commonVO);
+        // 获取第一个任务的taskId
+        actFlowCommonService.getFirstTaskId(processInstanceId, mainDraftUser, processDefinitionId);
+        // 手动翻译
+        String jsonData = translationAspect.manualParseDictText(initChangeDataVO, this.getUserMap(variables));
+        // 强制撤回
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);
         // 根据流程实例id更新流程总表
         Integer prcType = ProcessTypeEnum.ES_INIT_CHANGE.getValue();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/listener/ProcessESRecheckEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/listener/ProcessESRecheckEndListener.java
index c3d06880..f08d747b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/listener/ProcessESRecheckEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/listener/ProcessESRecheckEndListener.java
@@ -3,20 +3,12 @@ package com.jero.modules.activiti.process.esRecheck.listener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.constant.enums.YesOrNoEnum;
-import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
-import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
-import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPApplicationCategoryEnum;
-import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPChangeType;
-import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
 import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
 import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
 import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
-import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
-import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
-import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +18,6 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.Date;
-import java.util.List;
 
 import static com.jero.modules.activiti.process.esRecheck.entity.ProcessRecheckConstants.*;