From f41c49a6683ed5f519080f3d95032de8bca0f202 Mon Sep 17 00:00:00 2001 From: wangli Date: Sun, 10 Dec 2023 14:24:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=B5=8B=E8=AF=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=AD=90=E4=BB=BB=E5=8A=A1=E6=97=B6,=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=88=B6=E4=BB=BB=E5=8A=A1=E7=9A=84=20ExecutionId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BpmnProcessTaskServiceImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java index af17eda8a..c26d84ede 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java @@ -325,12 +325,12 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { saveAttachment(dto.getAttachmentList(), instance.getId(), task.getId()); // 完成任务，审批通过 - if (StringUtils.hasLength(task.getExecutionId())) { +// if (StringUtils.hasLength(task.getExecutionId())) { taskService.complete(task.getId(), runtimeService.getVariables(task.getExecutionId())); - } else { +// } else { //加签子任务 没有executionId - taskService.complete(task.getId()); - } +// taskService.complete(task.getId()); +// } //add by zuoqinbo 处理加签[分为向前加签和向后加签]或转交的任务 String parentTaskId = task.getParentTaskId(); @@ -456,9 +456,10 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { // task.setPriority(parentTask.getPriority()); // task.setCreateTime(new Date()); - Map executionVariables = new HashMap<>(); - executionVariables.put("assigneeName", assigner.buildAssigneeId()); - Execution subExecution = runtimeService.addMultiInstanceExecution(parentTask.getTaskDefinitionKey(), parentTask.getProcessInstanceId(), executionVariables); +// Map executionVariables = new HashMap<>(); +// executionVariables.put("assigneeName", assigner.buildAssigneeId()); + Execution execution = runtimeService.executeActivityInAdhocSubProcess(parentTask.getExecutionId(), parentTask.getTaskDefinitionKey()); +// Execution subExecution = runtimeService.addMultiInstanceExecution(parentTask.getTaskDefinitionKey(), parentTask.getProcessInstanceId(), executionVariables); // ExecutionEntity concurrentExecution = CommandContextUtil.getExecutionEntityManager() // .createChildExecution((ExecutionEntity) multiInstanceRootExecution); // Execution subExecution = runtimeService.createExecutionQuery()