From c548fceb3f9ed55c66d15ebd01edd6e0c0f94de6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 20 Feb 2024 14:53:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=B8=BA=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/esRevision/entity/ProcessEsRevision.java        | 6 ++++++
 .../esRevision/service/impl/EsRevisionServiceImpl.java      | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
index 44a1f4d9..a1f63a35 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
@@ -310,6 +310,12 @@ public class ProcessEsRevision implements Serializable {
     @ApiModelProperty(value = "在线编辑文件id")
     private String onEditFile;
 
+    /**
+     * 自动发起标识
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "自动发起标识")
+    private boolean autoStartFlag;
 
     public void setOtherDrafterUploadFileJson(String otherDrafterUploadFileJson) {
         this.otherDrafterUploadFileJson = otherDrafterUploadFileJson;
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 029ee03d..6ea0a411 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
@@ -153,8 +153,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
+        ESRevisionDataVO handleData = this.getHandleData(taskId);
+        handleData.getData().setAutoStartFlag(false);
         // 手动翻译
-        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), revisionData.getFlowUser());
+        String jsonData = translationAspect.manualParseDictText(handleData, revisionData.getFlowUser());
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
@@ -274,6 +276,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         revisionData.setCommon(commonVO);
         // 获取第一个任务的taskId
         actFlowCommonService.getFirstTaskId(processInstanceId, mainDraftUser, processDefinitionId);
+        revisionData.getData().setAutoStartFlag(true);
         // 手动翻译
         String jsonData = translationAspect.autoParseDictText(revisionData, variables);
         // 强制撤回