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

update - 任务日志查询,返回 nodetype

Browse Source
This commit is contained in:
wangli 2024-03-25 15:26:32 +08:00
parent 3fd63b0e17
commit b9717a6f04
1 changed files with 8 additions and 1 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/service/impl/BpmnProcessTaskServiceImpl.java
View File

@ -42,11 +42,13 @@ import cn.axzo.workflow.core.service.converter.BpmnTaskTodoPageItemConverter;
import cn.hutool.core.collection.CollUtil;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.common.engine.impl.interceptor.CommandExecutor;
import org.flowable.engine.HistoryService;
import org.flowable.engine.ManagementService;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
@ -132,6 +134,8 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
private SpringProcessEngineConfiguration processEngineConfiguration;
@Resource
private ExtAxHiTaskInstService extAxHiTaskInstService;
@Resource
private RepositoryService repositoryService;
@Override
public BpmPageResult<BpmnTaskTodoPageItemVO> getTodoTaskPage(BpmnTaskPageSearchDTO dto) {
@ -347,6 +351,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
Map<String, ExtAxHiTaskInst> extTaskInstMap = extAxHiTaskInstService.queryList(searchDTO).stream()
.collect(Collectors.toMap(ExtAxHiTaskInst::getTaskId, Function.identity(), (s, t) -> s));
BpmnModel bpmnModel = repositoryService.getBpmnModel(instance.getProcessDefinitionId());
for (BpmnHistoricTaskInstanceVO vo : vos) {
ExtAxHiTaskInst taskInst = extTaskInstMap.getOrDefault(vo.getTaskId(), new ExtAxHiTaskInst());
vo.setResult(valueOfStatus(taskInst.getStatus()));
@ -384,6 +389,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
if (Objects.nonNull(assigner) && !Objects.equals(assigner.buildAssigneeId(), NO_ASSIGNEE)) {
vo.setAssigneeSnapshot(assigner);
}
BpmnMetaParserHelper.getNodeType(bpmnModel.getFlowElement(vo.getTaskDefinitionKey())).ifPresent(vo::setNodeType);
}
return vos;
}
@ -494,7 +500,8 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
public void countersignTask(BpmnTaskCountersignDTO dto) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
commandExecutor.execute(new CustomCountersignUserTaskCmd(BpmnCountersignTypeEnum.valueOfType(dto.getCountersignType()), dto.getTaskId(),
dto.getOriginAssigner(), dto.getAdvice(), dto.getAttachmentList(), dto.getTargetAssignerList(), extAxHiTaskInstService));
dto.getOriginAssigner(), dto.getAdvice(), dto.getAttachmentList(), dto.getTargetAssignerList(),
extAxHiTaskInstService));
}
@Override