wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 测试创建子任务时,添加父任务的 ExecutionId

Browse Source
This commit is contained in:
wangli 2023-12-10 14:06:10 +08:00
parent 482b399e4f
commit 9aad448b36
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
View File

@ -21,7 +21,6 @@ import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskInstanceVO;
import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskTodoPageItemVO;
import cn.axzo.workflow.core.common.exception.WorkflowEngineException;
import cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper;
import cn.axzo.workflow.core.engine.cmd.CustomEventAssignment;
import cn.axzo.workflow.core.engine.event.MessagePushEventBuilder;
import cn.axzo.workflow.core.engine.event.MessagePushEventImpl;
import cn.axzo.workflow.core.engine.event.MessagePushEventType;
@ -41,7 +40,6 @@ import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.bpmn.model.UserTask;
import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
import org.flowable.common.engine.impl.cfg.IdGenerator;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.HistoryService;
import org.flowable.engine.ManagementService;
@ -77,7 +75,6 @@ import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -444,20 +441,20 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
TaskEntity task = null;
if (parentTask != null) {
//1.生成新的工作流子任务
IdGenerator idGenerator = springProcessEngineConfiguration.getIdGenerator();
task = (TaskEntity) taskService.newTask(idGenerator.getNextId());
task.setCategory(parentTask.getCategory());
task.setDescription(parentTask.getDescription());
task.setTenantId(parentTask.getTenantId());
task.setName(parentTask.getName());
task.setAssignee(assigner.buildAssigneeId());
task.setParentTaskId(parentTaskId);
task.setProcessDefinitionId(parentTask.getProcessDefinitionId());
task.setProcessInstanceId(parentTask.getProcessInstanceId());
task.setTaskDefinitionKey(parentTask.getTaskDefinitionKey());
task.setTaskDefinitionId(parentTask.getTaskDefinitionId());
task.setPriority(parentTask.getPriority());
task.setCreateTime(new Date());
// IdGenerator idGenerator = springProcessEngineConfiguration.getIdGenerator();
// task = (TaskEntity) taskService.newTask(idGenerator.getNextId());
// task.setCategory(parentTask.getCategory());
// task.setDescription(parentTask.getDescription());
// task.setTenantId(parentTask.getTenantId());
// task.setName(parentTask.getName());
// task.setAssignee(assigner.buildAssigneeId());
// task.setParentTaskId(parentTaskId);
// task.setProcessDefinitionId(parentTask.getProcessDefinitionId());
// task.setProcessInstanceId(parentTask.getProcessInstanceId());
// task.setTaskDefinitionKey(parentTask.getTaskDefinitionKey());
// task.setTaskDefinitionId(parentTask.getTaskDefinitionId());
// task.setPriority(parentTask.getPriority());
// task.setCreateTime(new Date());
Map<String, Object> executionVariables = new HashMap<>();
executionVariables.put("assigneeName", assigner.buildAssigneeId());
@ -468,11 +465,11 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
// .parentId(parentTask.getExecutionId()) // 将新执行实例设置为当前执行实例的子实例
// .activityId(parentTask.getTaskDefinitionKey()) // 指定活动ID
// .singleResult();
task.setExecutionId(subExecution.getId());
// task.setExecutionId(subExecution.getId());
log.info("流程加签父任务:{},正在创建加签子任务:{},", parentTaskId, JSONUtil.toJsonStr(Lists.newArrayList(task)));
taskService.saveTask(task);
// taskService.saveTask(task);
springProcessEngineConfiguration.getCommandExecutor().execute(new CustomEventAssignment(parentTask.getProcessDefinitionId(), parentTask.getTaskDefinitionKey(), task));
// springProcessEngineConfiguration.getCommandExecutor().execute(new CustomEventAssignment(parentTask.getProcessDefinitionId(), parentTask.getTaskDefinitionKey(), task));
}
return task;
}