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

update - 完善虚拟机器人节点的完成时,重新分配给原审批人

Browse Source
This commit is contained in:
wangli 2024-01-02 16:09:27 +08:00
parent 36b9e86ae6
commit 5a591e44fa
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCompleteDummyTaskCmd.java
View File

@ -8,6 +8,7 @@ import org.flowable.engine.TaskService;
import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl; import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.flowable.engine.impl.util.CommandContextUtil; import org.flowable.engine.impl.util.CommandContextUtil;
import org.flowable.task.api.Task; import org.flowable.task.api.Task;
import org.flowable.task.service.impl.persistence.entity.HistoricTaskInstanceEntity;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.io.Serializable; import java.io.Serializable;
@ -66,11 +67,17 @@ public class CustomCompleteDummyTaskCmd implements Command<Void>, Serializable {
if (CollectionUtils.isEmpty(taskList)) { if (CollectionUtils.isEmpty(taskList)) {
return; return;
} }
List<HistoricTaskInstanceEntity> inCache =
CommandContextUtil.getEntityCache().findInCache(HistoricTaskInstanceEntity.class);
taskList.stream().filter(i -> !Objects.equals(i.getTaskDefinitionKey(), DUMMY_ID)) taskList.stream().filter(i -> !Objects.equals(i.getTaskDefinitionKey(), DUMMY_ID))
.filter(i -> Objects.nonNull(i.getOwner())) .filter(i -> Objects.nonNull(i.getOwner()))
.forEach(i -> { .forEach(i -> {
i.setOwner(null);
i.setAssignee(i.getOwner()); i.setAssignee(i.getOwner());
i.setOwner(null);
inCache.stream().filter(cache -> Objects.equals(cache.getId(), i.getId())).findFirst().ifPresent(j -> {
j.setAssignee(i.getOwner());
j.setOwner(null);
});
}); });
} }
} }

13
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java
View File

@ -100,18 +100,17 @@ public class CustomCreateDummyTaskCmd implements Command<String>, Serializable {
CommandContextUtil.getProcessEngineConfiguration(commandContext); CommandContextUtil.getProcessEngineConfiguration(commandContext);
TaskService taskService = processEngineConfiguration.getTaskService(); TaskService taskService = processEngineConfiguration.getTaskService();
List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).active().list(); List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).active().list();
List<HistoricTaskInstanceEntity> inCache =
CommandContextUtil.getEntityCache().findInCache(HistoricTaskInstanceEntity.class);
if (!CollectionUtils.isEmpty(taskList)) { if (!CollectionUtils.isEmpty(taskList)) {
taskList.forEach(i -> { taskList.forEach(i -> {
i.setOwner(i.getAssignee()); i.setOwner(i.getAssignee());
i.setAssignee(HIDDEN_ASSIGNEE_ID); i.setAssignee(HIDDEN_ASSIGNEE_ID);
inCache.stream().filter(cache -> Objects.equals(cache.getId(), i.getId())).findFirst().ifPresent(j -> {
j.setOwner(j.getAssignee());
j.setAssignee(HIDDEN_ASSIGNEE_ID);
});
}); });
// CustomTaskHelper.addMultiTask(commandContext, (TaskEntity) taskList.get(0), assigner);
//
// taskList.stream().filter(i -> !Objects.equals(i.getTaskDefinitionKey(), DUMMY_ID)).forEach
// (task -> {
// CustomTaskHelper.deleteMultiTask(commandContext, (TaskEntity) task);
// });
} }
} }
} }