BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 4347f1336299664693f77f1a7aa3129f59a3d53b

Authored by YunaiV
1 parent 76d89067

review：【BPM 工作流】并行分支使用包容网关实现 =》补充一些注释说明

Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
  View file @4347f13
@@ -592,8 +592,9 @@ public class SimpleModelUtils { @@ -592,8 +592,9 @@ public class SimpleModelUtils {
592 private static class ParallelBranchNodeConvert implements NodeConvert { 592 private static class ParallelBranchNodeConvert implements NodeConvert {
593 593
594 /** 594 /**
595 - * 并行分支使用包容网关。需要设置所有出口条件表达式的值为 true.  
596 - * 参见: {@link ConditionNodeConvert#buildSequenceFlow} 595 + * 并行分支使用包容网关。需要设置所有出口条件表达式的值为 true 。原因是，解决 https://t.zsxq.com/m6GXh 反馈问题
  596 + *
  597 + * @see {@link ConditionNodeConvert#buildSequenceFlow}
597 */ 598 */
598 @Override 599 @Override
599 public List<InclusiveGateway> convertList(BpmSimpleModelNodeVO node) { 600 public List<InclusiveGateway> convertList(BpmSimpleModelNodeVO node) {
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
  View file @4347f13
@@ -265,7 +265,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @@ -265,7 +265,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
265 // 3. 获取下一个将要执行的节点集合 265 // 3. 获取下一个将要执行的节点集合
266 FlowElement flowElement = bpmnModel.getFlowElement(task.getTaskDefinitionKey()); 266 FlowElement flowElement = bpmnModel.getFlowElement(task.getTaskDefinitionKey());
267 List<FlowNode> nextFlowNodes = BpmnModelUtils.getNextFlowNodes(flowElement, bpmnModel, processVariables); 267 List<FlowNode> nextFlowNodes = BpmnModelUtils.getNextFlowNodes(flowElement, bpmnModel, processVariables);
268 - // 仅仅获取 UserTask 节点 TODO：如果网关节点和网关节点相连，获取下个 UserTask. 貌似有点不准。 268 + // 仅仅获取 UserTask 节点 TODO add from jason：如果网关节点和网关节点相连，获取下个 UserTask. 貌似有点不准。
269 List<FlowNode> nextUserTaskList = CollectionUtils.filterList(nextFlowNodes, node -> node instanceof UserTask); 269 List<FlowNode> nextUserTaskList = CollectionUtils.filterList(nextFlowNodes, node -> node instanceof UserTask);
270 List<ActivityNode> nextActivityNodes = convertList(nextUserTaskList, node -> new ActivityNode().setId(node.getId()) 270 List<ActivityNode> nextActivityNodes = convertList(nextUserTaskList, node -> new ActivityNode().setId(node.getId())
271 .setName(node.getName()).setNodeType(BpmSimpleModelNodeTypeEnum.APPROVE_NODE.getType()) 271 .setName(node.getName()).setNodeType(BpmSimpleModelNodeTypeEnum.APPROVE_NODE.getType())