update - 完善任务节点聚合后的状态处理
This commit is contained in:
parent
fccc215aa4
commit
fdec2b2df5
@ -403,6 +403,20 @@ public class BpmnTaskServiceImpl implements BpmnTaskService {
|
|||||||
BpmnHistoricTaskInstanceGroupVO groupVO = new BpmnHistoricTaskInstanceGroupVO();
|
BpmnHistoricTaskInstanceGroupVO groupVO = new BpmnHistoricTaskInstanceGroupVO();
|
||||||
groupVO.setProcessInstanceId(processInstanceId);
|
groupVO.setProcessInstanceId(processInstanceId);
|
||||||
groupVO.setTaskDefinitionKey(entry.getKey());
|
groupVO.setTaskDefinitionKey(entry.getKey());
|
||||||
|
if (CollectionUtils.isEmpty(entry.getValue())) {
|
||||||
|
groupVO.setResult(PROCESSING);
|
||||||
|
} else if (entry.getValue().size() == 1) {
|
||||||
|
groupVO.setResult(entry.getValue().get(0).getResult());
|
||||||
|
} else {
|
||||||
|
if (entry.getValue().stream().allMatch(i -> Objects.equals(APPROVED, i.getResult()))) {
|
||||||
|
groupVO.setResult(APPROVED);
|
||||||
|
} else if (entry.getValue().stream().anyMatch(i -> Objects.equals(PROCESSING, i.getResult()))) {
|
||||||
|
groupVO.setResult(PROCESSING);
|
||||||
|
} else if (entry.getValue().stream().anyMatch(i -> Objects.equals(REJECTED, i.getResult()))) {
|
||||||
|
// FIXME 明显存在问题
|
||||||
|
groupVO.setResult(REJECTED);
|
||||||
|
}
|
||||||
|
}
|
||||||
groupVO.setTasks(entry.getValue());
|
groupVO.setTasks(entry.getValue());
|
||||||
groupVos.add(groupVO);
|
groupVos.add(groupVO);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user