diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java index 1846512d..16625418 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java @@ -47,7 +47,7 @@ public class ProcessModelNodeService extends ServiceImpl flowElements = process.getFlowElements(); List processModelNodeList = new ArrayList<>(); - int sort = 1; //审批节点list List gatewayIdList = new ArrayList<>(); //处理节点为list - processModelNodeList = handlerLawsProcessModelNode(flowElements,sort,gatewayIdList,modelId, null); + processModelNodeList = handlerLawsProcessModelNode(flowElements,gatewayIdList,modelId, null); List approvalNodeIdList = processModelNodeList.stream() .filter(item -> gatewayIdList.contains(item.getXmlTargetRef())) .map(ProcessModelNode::getXmlSourceRef) @@ -355,7 +354,6 @@ public class ProcessModelNodeService extends ServiceImpl handlerLawsProcessModelNode( Collection flowElements, - int sort, List gatewayIdList, String modelId, String subNodeId) { List processModelNodeList = new ArrayList<>(); @@ -403,7 +401,7 @@ public class ProcessModelNodeService extends ServiceImpl flowElements1 = subProcess.getFlowElements(); xmlNodeId = subProcess.getId(); - List processModelNodes = handlerLawsProcessModelNode(flowElements1, sort, gatewayIdList, modelId, xmlNodeId); + List processModelNodes = handlerLawsProcessModelNode(flowElements1, gatewayIdList, modelId, xmlNodeId); processModelNodeList.addAll(processModelNodes); nodeType = "subProcess"; nodeName = subProcess.getName(); diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn new file mode 100644 index 00000000..a2ab8824 --- /dev/null +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn @@ -0,0 +1,257 @@ + + + + + Flow_12b9yhd + + + + Flow_12b9yhd + Flow_0tgn37q + + + + Flow_0tgn37q + Flow_0w3nr57 + + ${nrOfInstances == nrOfCompletedInstances} + + + Flow_1g6zc95 + + + + Flow_1g6zc95 + Flow_168zkyq + + + + Flow_168zkyq + Flow_1o0npc9 + + ${nrOfInstances == nrOfCompletedInstances} + + + Flow_0xb4gtd + + + Flow_0xb4gtd + Flow_1d18hwv + + + + Flow_1d18hwv + Flow_07hxwn8 + Flow_09f92lr + + ${nrOfInstances == nrOfCompletedInstances} + + + + + Flow_09f92lr + Flow_1w5wrt4 + + + + Flow_1w5wrt4 + Flow_1m6dxws + Flow_07hxwn8 + + + + Flow_1m6dxws + + + ${pass} + + + ${!pass} + + + + Flow_1o0npc9 + Flow_0mpm9av + Flow_10o9sl2 + + + + Flow_10o9sl2 + Flow_11i64js + Flow_132fp4x + + + + ${!pass} + + + Flow_132fp4x + + + ${pass} + + + + Flow_11i64js + Flow_0mpm9av + + ${nrOfInstances == nrOfCompletedInstances} + + + + + Flow_0w3nr57 + Flow_14lgswg + + + + Flow_14lgswg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn new file mode 100644 index 00000000..c3ea14af --- /dev/null +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn @@ -0,0 +1,257 @@ + + + + + Flow_12b9yhd + + + + Flow_12b9yhd + Flow_0tgn37q + + + + Flow_0tgn37q + Flow_0w3nr57 + + ${nrOfInstances == nrOfCompletedInstances} + + + Flow_1g6zc95 + + + + Flow_1g6zc95 + Flow_168zkyq + + + + Flow_168zkyq + Flow_1o0npc9 + + ${nrOfInstances == nrOfCompletedInstances} + + + Flow_0xb4gtd + + + Flow_0xb4gtd + Flow_1d18hwv + + + + Flow_1d18hwv + Flow_07hxwn8 + Flow_09f92lr + + ${nrOfInstances == nrOfCompletedInstances} + + + + + Flow_09f92lr + Flow_1w5wrt4 + + + + Flow_1w5wrt4 + Flow_1m6dxws + Flow_07hxwn8 + + + + Flow_1m6dxws + + + ${pass} + + + ${!pass} + + + + Flow_1o0npc9 + Flow_0mpm9av + Flow_10o9sl2 + + + + Flow_10o9sl2 + Flow_11i64js + Flow_132fp4x + + + + ${!pass} + + + Flow_132fp4x + + + ${pass} + + + + Flow_11i64js + Flow_0mpm9av + + ${nrOfInstances == nrOfCompletedInstances} + + + + + Flow_0w3nr57 + Flow_14lgswg + + + + Flow_14lgswg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +