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

Merge branch 'feature/REQ-1309' into dev

Browse Source
This commit is contained in:
wangli 2023-10-07 17:52:34 +08:00
commit dbeb503d9a
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeMode.java
View File

@ -2,6 +2,7 @@ package cn.axzo.workflow.common.enums;
public enum BpmnFlowNodeMode {
STARTNODE("STARTNODE", "发起节点"),
GENERAL("GENERAL", "普通"),
OR("OR", "或签"),
AND("AND", "会签");

21
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -46,6 +46,7 @@ import org.flowable.bpmn.model.Pool;
import org.flowable.bpmn.model.SequenceFlow;
import org.flowable.bpmn.model.ServiceTask;
import org.flowable.bpmn.model.SignalEventDefinition;
import org.flowable.bpmn.model.StartEvent;
import org.flowable.bpmn.model.SubProcess;
import org.flowable.bpmn.model.TextAnnotation;
import org.flowable.bpmn.model.TimerEventDefinition;
@ -558,9 +559,10 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
throw new WorkflowEngineException(PROCESS_INSTANCE_ID_NOT_EXISTS, processInstanceId);
}
BpmnModel bpmnModel = repositoryService.getBpmnModel(instance.getProcessDefinitionId());
List<FlowElement> flowElements =
bpmnModel.getMainProcess().getFlowElements().stream().filter(UserTask.class::isInstance).collect(Collectors.toList());
List<ProcessNodeDetailVO> resultList = new ArrayList<>(flowElements.size());
List<ProcessNodeDetailVO> resultList = new ArrayList<>(flowElements.size() + 1);
flowElements.forEach(i -> {
UserTask userTask = (UserTask) i;
ProcessNodeDetailVO node = new ProcessNodeDetailVO().setId(userTask.getId())
@ -574,15 +576,28 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
}
resultList.add(node);
});
// 处理发起节点
List<FlowElement> startNodes =
bpmnModel.getMainProcess().getFlowElements().stream().filter(StartEvent.class::isInstance).collect(Collectors.toList());
startNodes.forEach(i -> {
StartEvent startEvent = (StartEvent) i;
ProcessNodeDetailVO node = new ProcessNodeDetailVO()
.setId(startEvent.getId())
.setName(startEvent.getName())
.setFormKey(startEvent.getFormKey())
.setNodeMode(BpmnFlowNodeMode.STARTNODE);
resultList.add(0, node);
});
return resultList;
}
private List<String> gatherCompletedFlows(Set<String> completedActivityInstances,
Set<String> currentActivityinstances, BpmnModel pojoModel) {
Set<String> currentActivityInstances, BpmnModel pojoModel) {
List<String> completedFlows = new ArrayList<>();
List<String> activities = new ArrayList<>(completedActivityInstances);
activities.addAll(currentActivityinstances);
activities.addAll(currentActivityInstances);
// TODO: not a robust way of checking when parallel paths are active, should be revisited
// Go over all activities and check if it's possible to match any outgoing paths against the activities