From 47f306a4f3dc009c4310d0975632188767957371 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 29 Apr 2024 11:25:10 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=BC=82=E6=AD=A5=E5=8C=96?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/AutoOperatorEvent_101_Listener.java  | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
index 2e14d285f..699e97c53 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
@@ -86,37 +86,7 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener<Ta
         log.info("AutoOperatorEventListener#onCreated...{}", delegateTask.getTaskDefinitionKey());
 
         if (Objects.equals(NODE_STARTER.getType(), delegateTask.getTaskDefinitionKey())) {
-            ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration();
-            JobService jobService = processEngineConfiguration.getJobServiceConfiguration().getJobService();
-
-            JobEntity job = jobService.createJob();
-            // 这里的 executionId 可为 null
-            job.setExecutionId(delegateTask.getExecutionId());
-            job.setProcessInstanceId(delegateTask.getProcessInstanceId());
-            job.setProcessDefinitionId(delegateTask.getProcessDefinitionId());
-            job.setElementId(delegateTask.getTaskDefinitionKey());
-            job.setElementName(delegateTask.getName());
-            job.setJobHandlerType(AsyncApproveTaskJobHandler.TYPE);
-            job.setTenantId(delegateTask.getTenantId());
-
-            BpmnTaskAuditDTO dto = new BpmnTaskAuditDTO();
-            dto.setTaskId(delegateTask.getId());
-
-            BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(delegateTask.getVariable(INTERNAL_INITIATOR)));
-            if (Objects.nonNull(initiator)) {
-                delegateTask.setVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId(),
-                        initiator.toJson());
-            }
-            dto.setApprover(initiator);
-            // 携带自定义的数据
-            job.setCustomValues(JSONUtil.toJsonStr(dto));
-
-            // 创建异步任务并调度
-            jobService.createAsyncJob(job, false);
-            jobService.scheduleAsyncJob(job);
-
-
-
+            createAsyncApproveJob(delegateTask);
             /*BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(delegateTask.getVariable(INTERNAL_INITIATOR)));
             if (Objects.nonNull(initiator)) {
                 delegateTask.setVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId(),
@@ -147,6 +117,37 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener<Ta
         log.info("AutoOperatorEventListener#onCreated...end: {}", delegateTask.getTaskDefinitionKey());
     }
 
+    private void createAsyncApproveJob(DelegateTask delegateTask) {
+        ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration();
+        JobService jobService = processEngineConfiguration.getJobServiceConfiguration().getJobService();
+
+        JobEntity job = jobService.createJob();
+        // 这里的 executionId 可为 null
+        job.setExecutionId(delegateTask.getExecutionId());
+        job.setProcessInstanceId(delegateTask.getProcessInstanceId());
+        job.setProcessDefinitionId(delegateTask.getProcessDefinitionId());
+        job.setElementId(delegateTask.getTaskDefinitionKey());
+        job.setElementName(delegateTask.getName());
+        job.setJobHandlerType(AsyncApproveTaskJobHandler.TYPE);
+        job.setTenantId(delegateTask.getTenantId());
+
+        BpmnTaskAuditDTO dto = new BpmnTaskAuditDTO();
+        dto.setTaskId(delegateTask.getId());
+
+        BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(delegateTask.getVariable(INTERNAL_INITIATOR)));
+        if (Objects.nonNull(initiator)) {
+            delegateTask.setVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId(),
+                    initiator.toJson());
+        }
+        dto.setApprover(initiator);
+        // 携带自定义的数据
+        job.setCustomValues(JSONUtil.toJsonStr(dto));
+
+        // 创建异步任务并调度
+        jobService.createAsyncJob(job, false);
+        jobService.scheduleAsyncJob(job);
+    }
+
     /**
      * 校验当前的审批人是否存在过前一个节点
      *