Skip to content

D
datacollector
Commit af245097 by chenweisong
Options

更新

parent ea4c0ca6
Showing with 286 additions and 887 deletions
src/main/java/com/keymobile/rest/controller/ExcelController.java
...@@ -86,25 +86,25 @@ public class ExcelController { ...@@ -86,25 +86,25 @@ public class ExcelController {
// 已经完成的会签任务数量 // 已经完成的会签任务数量
int nrOfCompletedInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfCompletedInstances").toString()); int nrOfCompletedInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfCompletedInstances").toString());
if (nrOfCompletedInstances == nrOfInstances - 1) { // if (nrOfCompletedInstances == nrOfInstances - 1) {
if (template.getNeedConfirm() == Template.NEED_CONFIRM) { // if (template.getNeedConfirm() == Template.NEED_CONFIRM) {
vars.put("NeedConfirm", true); // vars.put("NeedConfirm", true);
vars.put("manager", "审核人"); // vars.put("manager", "审核人");
} else { // } else {
vars.put("NeedConfirm", false); // vars.put("NeedConfirm", false);
if (StringUtils.isNotEmpty(template.getBackStreamAddr())) { // if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
vars.put("NeedDataBack", true); // vars.put("NeedDataBack", true);
vars.put("backFlowUser", "数据回流人"); // vars.put("backFlowUser", "数据回流人");
} else { // } else {
vars.put("NeedDataBack", false); // vars.put("NeedDataBack", false);
// 流程完 // // 流程完
Activity activity = process.getActivity(); // Activity activity = process.getActivity();
activity.setStatus(Activity.STATUS_WAIT); // activity.setStatus(Activity.STATUS_WAIT);
activityService.save(activity); // activityService.save(activity);
} // }
} // }
taskService.complete(task.getId(), vars); // taskService.complete(task.getId(), vars);
} // }
return "成功"; return "成功";
} }
......
src/main/resources/MoreSubProcess.bpmn deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn"
xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC"
xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/testm1585201515028"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
expressionLanguage="http://www.w3.org/1999/XPath" id="m1585201515028" name=""
targetNamespace="http://www.activiti.org/testm1585201515028"
typeLanguage="http://www.w3.org/2001/XMLSchema">
<process id="MoreSubProcess" isClosed="false" isExecutable="true" processType="None">
<startEvent id="_2" name="StartEvent"/>
<userTask activiti:assignee="${inputUser}" activiti:exclusive="true" id="StartMission" name="启动补录任务"/>
<sequenceFlow id="_4" sourceRef="_2" targetRef="StartMission"/>
<subProcess activiti:exclusive="true" id="_5" triggeredByEvent="false">
<multiInstanceLoopCharacteristics activiti:collection="candidateUsers"
activiti:elementVariable="candidateUser" isSequential="false">
<completionCondition>
<!-- 这里表示当完成数和总数相等的时候到下一步 -->
<![CDATA[${nrOfCompletedInstances/nrOfInstances == 1}]]>
</completionCondition>
</multiInstanceLoopCharacteristics>
<startEvent id="_7" name="StartEvent"/>
<userTask activiti:assignee="${candidateUser}" activiti:candidateUsers="${candidateUsers}"
activiti:exclusive="true" id="DataEnter" name="填写补录数据"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_9"/>
<endEvent id="_10" name="EndEvent"/>
<sequenceFlow id="_11" sourceRef="DataEnter" targetRef="_9"/>
<sequenceFlow id="_12" sourceRef="_9" targetRef="_10">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataAudit == 'false'}]]>
</conditionExpression>
</sequenceFlow>
<userTask activiti:assignee="${auditUser}" activiti:exclusive="true" id="DataAudit" name="审核数据"/>
<sequenceFlow id="_14" sourceRef="_9" targetRef="DataAudit">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataAudit == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<exclusiveGateway gatewayDirection="Unspecified" id="_15"/>
<sequenceFlow id="_16" sourceRef="DataAudit" targetRef="_15"/>
<sequenceFlow id="_17" sourceRef="_15" targetRef="DataEnter">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${dataAudit == 'false'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_18" sourceRef="_15" targetRef="_10">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataAudit == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_35" sourceRef="_7" targetRef="DataEnter"/>
</subProcess>
<sequenceFlow id="_6" sourceRef="StartMission" targetRef="_5"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_19"/>
<sequenceFlow id="_20" sourceRef="_5" targetRef="_19"/>
<userTask activiti:assignee="${inputUser}" activiti:exclusive="true" id="UserAudit" name="负责人审核"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_22"/>
<sequenceFlow id="_23" sourceRef="UserAudit" targetRef="_22"/>
<endEvent id="_24" name="EndEvent"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_25"/>
<sequenceFlow id="_26" sourceRef="_19" targetRef="UserAudit">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needConfirm == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_27" sourceRef="_19" targetRef="_25">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needConfirm == 'false'}]]>
</conditionExpression>
</sequenceFlow>
<userTask activiti:assignee="${backflowUser}" activiti:exclusive="true" id="DataBackFlow" name="数据回流"/>
<sequenceFlow id="_29" sourceRef="_25" targetRef="DataBackFlow">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataBackflow == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_31" sourceRef="_22" targetRef="_24">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${signConfirm == 'false'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_32" sourceRef="DataBackFlow" targetRef="_24"/>
<sequenceFlow id="_33" sourceRef="_22" targetRef="_25">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${signConfirm == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_34" sourceRef="_25" targetRef="_24">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataBackflow == 'false'}]]>
</conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram
documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0"
id="Diagram-_1" name="New Diagram">
<bpmndi:BPMNPlane bpmnElement="MoreSubProcess">
<bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
<dc:Bounds height="32.0" width="32.0" x="10.0" y="55.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="StartMission" id="Shape-StartMission">
<dc:Bounds height="55.0" width="85.0" x="95.0" y="45.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5" isExpanded="true">
<dc:Bounds height="250.0" width="400.0" x="275.0" y="35.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="250.0" width="400.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_19" id="Shape-_19" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="745.0" y="60.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="UserAudit" id="Shape-UserAudit">
<dc:Bounds height="55.0" width="85.0" x="720.0" y="200.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_22" id="Shape-_22" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="740.0" y="335.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_24" id="Shape-_24">
<dc:Bounds height="32.0" width="32.0" x="875.0" y="415.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_25" id="Shape-_25" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="870.0" y="200.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DataBackFlow" id="Shape-DataBackFlow">
<dc:Bounds height="55.0" width="85.0" x="1040.0" y="115.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_7" id="Shape-_7">
<dc:Bounds height="32.0" width="32.0" x="300.0" y="70.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DataEnter" id="Shape-DataEnter">
<dc:Bounds height="55.0" width="85.0" x="375.0" y="65.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_9" id="Shape-_9" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="510.0" y="70.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_10" id="Shape-_10">
<dc:Bounds height="32.0" width="32.0" x="605.0" y="195.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DataAudit" id="Shape-DataAudit">
<dc:Bounds height="55.0" width="85.0" x="445.0" y="150.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_15" id="Shape-_15" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="365.0" y="155.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="_35" id="BPMNEdge__35" sourceElement="_7" targetElement="DataEnter">
<di:waypoint x="332.0" y="86.0"/>
<di:waypoint x="375.0" y="92.5"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_12" id="BPMNEdge__12" sourceElement="_9" targetElement="_10">
<di:waypoint x="542.0" y="86.0"/>
<di:waypoint x="618.0" y="114.0"/>
<di:waypoint x="618.0" y="195.28376635449828"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="-38.0" width="-34.0" x="0.0" y="21.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_34" id="BPMNEdge__34" sourceElement="_25" targetElement="_24">
<di:waypoint x="902.0" y="216.0"/>
<di:waypoint x="973.0" y="299.0"/>
<di:waypoint x="907.0" y="431.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_14" id="BPMNEdge__14" sourceElement="_9" targetElement="DataAudit">
<di:waypoint x="520.0" y="96.0"/>
<di:waypoint x="520.0" y="150.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="2.0" width="0.0" x="0.0" y="20.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_17" id="BPMNEdge__17" sourceElement="_15" targetElement="DataEnter">
<di:waypoint x="386.0" y="160.0"/>
<di:waypoint x="386.0" y="120.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="5.0" width="0.0" x="0.0" y="6.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_16" id="BPMNEdge__16" sourceElement="DataAudit" targetElement="_15">
<di:waypoint x="445.0" y="177.5"/>
<di:waypoint x="397.0" y="171.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_18" id="BPMNEdge__18" sourceElement="_15" targetElement="_10">
<di:waypoint x="381.0" y="187.0"/>
<di:waypoint x="449.0" y="243.0"/>
<di:waypoint x="621.0" y="227.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="-6.0" x="0.0" y="-22.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_20" id="BPMNEdge__20" sourceElement="_5" targetElement="_19">
<di:waypoint x="675.0" y="160.0"/>
<di:waypoint x="745.0" y="76.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_23" id="BPMNEdge__23" sourceElement="UserAudit" targetElement="_22">
<di:waypoint x="756.0" y="255.0"/>
<di:waypoint x="756.0" y="335.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_26" id="BPMNEdge__26" sourceElement="_19" targetElement="UserAudit">
<di:waypoint x="761.0" y="92.0"/>
<di:waypoint x="761.0" y="200.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="-20.0" width="0.0" x="1.0" y="-6.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_27" id="BPMNEdge__27" sourceElement="_19" targetElement="_25">
<di:waypoint x="777.0" y="76.0"/>
<di:waypoint x="870.0" y="216.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="68.0" x="-1.0" y="-34.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_29" id="BPMNEdge__29" sourceElement="_25" targetElement="DataBackFlow">
<di:waypoint x="902.0" y="216.0"/>
<di:waypoint x="1040.0" y="142.5"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_4" id="BPMNEdge__4" sourceElement="_2" targetElement="StartMission">
<di:waypoint x="42.0" y="71.0"/>
<di:waypoint x="95.0" y="72.5"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="StartMission" targetElement="_5">
<di:waypoint x="180.0" y="72.5"/>
<di:waypoint x="275.0" y="160.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_31" id="BPMNEdge__31" sourceElement="_22" targetElement="_24">
<di:waypoint x="755.0" y="366.0"/>
<di:waypoint x="755.0" y="410.0"/>
<di:waypoint x="875.0" y="431.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_11" id="BPMNEdge__11" sourceElement="DataEnter" targetElement="_9">
<di:waypoint x="460.0" y="92.5"/>
<di:waypoint x="510.0" y="86.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_33" id="BPMNEdge__33" sourceElement="_22" targetElement="_25">
<di:waypoint x="772.0" y="351.0"/>
<di:waypoint x="885.0" y="260.0"/>
<di:waypoint x="885.0" y="231.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_32" id="BPMNEdge__32" sourceElement="DataBackFlow" targetElement="_24">
<di:waypoint x="1090.0" y="170.0"/>
<di:waypoint x="1090.0" y="310.0"/>
<di:waypoint x="907.0" y="431.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
src/main/resources/MoreSubProcessTest.bpmn deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1585034942112" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
<process id="moreSubProcess" isClosed="false" isExecutable="true" name="moreSubProcess" processType="None">
<startEvent id="startevent1" name="Start"/>
<userTask activiti:assignee="${inputUser}" activiti:exclusive="true" id="startEntry" name="开始录入"/>
<userTask activiti:candidateUsers="${groupDataStandardServiceImpl.findAssigneesForProcess(execution,&quot;group5&quot;)}" activiti:exclusive="true" id="headApply" name="负责人审核"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway2" name="Exclusive Gateway"/>
<endEvent id="endevent2" name="End"/>
<userTask activiti:candidateUsers="${groupDataStandardServiceImpl.findAssigneesForProcess(execution,&quot;group4&quot;)}" activiti:exclusive="true" id="dataBackFlow" name="数据回流"/>
<sequenceFlow id="flow1" sourceRef="startevent1" targetRef="startEntry"/>
<sequenceFlow id="flow11" sourceRef="headApply" targetRef="exclusivegateway2"/>
<sequenceFlow id="flow12" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway2" targetRef="endevent2"/>
<sequenceFlow id="flow13" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway2" targetRef="dataBackFlow"/>
<sequenceFlow id="flow14" sourceRef="dataBackFlow" targetRef="endevent2"/>
<subProcess activiti:exclusive="true" id="entrySubprocess" name="录入子流程" triggeredByEvent="false">
<multiInstanceLoopCharacteristics activiti:collection="candiateUsers" activiti:elementVariable="candiateUser" isSequential="false">
<completionCondition>
<!-- 这里表示当完成数和总数相等的时候到下一步 -->
<![CDATA[${nrOfCompletedInstances/nrOfInstances >= 1}]]>
</completionCondition>
</multiInstanceLoopCharacteristics>
<startEvent id="startevent2" name="Start"/>
<userTask activiti:assignee="${candiateUser}" activiti:async="true" activiti:exclusive="true" id="dataEntrySubTask" name="数据录入子任务"/>
<userTask activiti:assignee="${inputDataApply}" activiti:exclusive="true" id="dataApply" name="数据审核人员"/>
<endEvent id="endevent3" name="End"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway3" name="Exclusive Gateway"/>
<sequenceFlow id="flow17" sourceRef="startevent2" targetRef="dataEntrySubTask"/>
<sequenceFlow id="flow21" sourceRef="dataApply" targetRef="exclusivegateway3"/>
<sequenceFlow id="flow22" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway3" targetRef="dataEntrySubTask"/>
<sequenceFlow id="flow23" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway3" targetRef="endevent3"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway4" name="Exclusive Gateway"/>
<sequenceFlow id="flow24" sourceRef="dataEntrySubTask" targetRef="exclusivegateway4"/>
<sequenceFlow id="flow25" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway4" targetRef="dataApply"/>
<sequenceFlow id="flow26" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway4" targetRef="endevent3"/>
</subProcess>
<sequenceFlow id="flow15" sourceRef="startEntry" targetRef="entrySubprocess"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway5" name="Exclusive Gateway"/>
<sequenceFlow id="flow27" name="Y" skipExpression="${applySign=='true'}" sourceRef="exclusivegateway5" targetRef="headApply"/>
<sequenceFlow id="flow28" sourceRef="entrySubprocess" targetRef="exclusivegateway5"/>
<sequenceFlow id="flow29" name="N" skipExpression="${applySign=='false'}" sourceRef="exclusivegateway5" targetRef="dataBackFlow"/>
</process>
<bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
<bpmndi:BPMNPlane bpmnElement="moreSubProcess">
<bpmndi:BPMNShape bpmnElement="startevent1" id="Shape-startevent1">
<omgdc:Bounds height="32.0" width="32.0" x="40.0" y="5.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="startEntry" id="Shape-startEntry">
<omgdc:Bounds height="55.0" width="105.0" x="15.0" y="150.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="headApply" id="Shape-headApply">
<omgdc:Bounds height="55.0" width="105.0" x="710.0" y="310.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway2" id="Shape-exclusivegateway2" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="916.0" y="167.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="endevent2" id="Shape-endevent2">
<omgdc:Bounds height="32.0" width="32.0" x="1040.0" y="168.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataBackFlow" id="Shape-dataBackFlow">
<omgdc:Bounds height="55.0" width="105.0" x="880.0" y="-5.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="entrySubprocess" id="Shape-entrySubprocess" isExpanded="true">
<omgdc:Bounds height="205.0" width="421.0" x="200.0" y="77.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="205.0" width="421.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway5" id="Shape-exclusivegateway5" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="760.0" y="160.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="startevent2" id="Shape-startevent2">
<omgdc:Bounds height="32.0" width="32.0" x="210.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataEntrySubTask" id="Shape-dataEntrySubTask">
<omgdc:Bounds height="55.0" width="105.0" x="270.0" y="190.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataApply" id="Shape-dataApply">
<omgdc:Bounds height="55.0" width="105.0" x="380.0" y="120.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="endevent3" id="Shape-endevent3">
<omgdc:Bounds height="32.0" width="32.0" x="570.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway3" id="Shape-exclusivegateway3" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="510.0" y="127.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway4" id="Shape-exclusivegateway4" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="412.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow28" id="BPMNEdge_flow28" sourceElement="entrySubprocess" targetElement="exclusivegateway5">
<omgdi:waypoint x="621.0" y="179.5"/>
<omgdi:waypoint x="760.0" y="176.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow29" id="BPMNEdge_flow29" sourceElement="exclusivegateway5" targetElement="dataBackFlow">
<omgdi:waypoint x="775.0" y="161.0"/>
<omgdi:waypoint x="775.0" y="90.0"/>
<omgdi:waypoint x="880.0" y="22.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="700.0" y="166.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow24" id="BPMNEdge_flow24" sourceElement="dataEntrySubTask" targetElement="exclusivegateway4">
<omgdi:waypoint x="375.0" y="217.5"/>
<omgdi:waypoint x="412.0" y="216.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow25" id="BPMNEdge_flow25" sourceElement="exclusivegateway4" targetElement="dataApply">
<omgdi:waypoint x="428.0" y="200.0"/>
<omgdi:waypoint x="428.0" y="175.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="432.0" y="200.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow26" id="BPMNEdge_flow26" sourceElement="exclusivegateway4" targetElement="endevent3">
<omgdi:waypoint x="444.0" y="216.0"/>
<omgdi:waypoint x="570.0" y="216.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="452.0" y="220.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow27" id="BPMNEdge_flow27" sourceElement="exclusivegateway5" targetElement="headApply">
<omgdi:waypoint x="776.0" y="192.0"/>
<omgdi:waypoint x="776.0" y="310.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="720.0" y="186.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" sourceElement="startevent1" targetElement="startEntry">
<omgdi:waypoint x="56.0" y="37.0"/>
<omgdi:waypoint x="56.0" y="150.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow21" id="BPMNEdge_flow21" sourceElement="dataApply" targetElement="exclusivegateway3">
<omgdi:waypoint x="485.0" y="147.5"/>
<omgdi:waypoint x="510.0" y="143.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22" sourceElement="exclusivegateway3" targetElement="dataEntrySubTask">
<omgdi:waypoint x="529.0" y="130.0"/>
<omgdi:waypoint x="529.0" y="89.0"/>
<omgdi:waypoint x="452.0" y="89.0"/>
<omgdi:waypoint x="322.0" y="89.0"/>
<omgdi:waypoint x="322.5" y="190.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="530.0" y="127.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow23" id="BPMNEdge_flow23" sourceElement="exclusivegateway3" targetElement="endevent3">
<omgdi:waypoint x="538.0" y="147.0"/>
<omgdi:waypoint x="587.0" y="147.0"/>
<omgdi:waypoint x="587.0" y="200.0312805773287"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="550.0" y="147.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow17" id="BPMNEdge_flow17" sourceElement="startevent2" targetElement="dataEntrySubTask">
<omgdi:waypoint x="242.0" y="216.0"/>
<omgdi:waypoint x="270.0" y="217.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow13" id="BPMNEdge_flow13" sourceElement="exclusivegateway2" targetElement="dataBackFlow">
<omgdi:waypoint x="935.0" y="170.0"/>
<omgdi:waypoint x="935.0" y="95.0"/>
<omgdi:waypoint x="935.0" y="50.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="936.0" y="167.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14" sourceElement="dataBackFlow" targetElement="endevent2">
<omgdi:waypoint x="985.0" y="30.0"/>
<omgdi:waypoint x="1060.0" y="30.0"/>
<omgdi:waypoint x="1060.0" y="-32.0"/>
<omgdi:waypoint x="1240.0" y="-32.0"/>
<omgdi:waypoint x="1060.0" y="168.50806661517032"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow15" id="BPMNEdge_flow15" sourceElement="startEntry" targetElement="entrySubprocess">
<omgdi:waypoint x="120.0" y="177.5"/>
<omgdi:waypoint x="200.0" y="179.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11" sourceElement="headApply" targetElement="exclusivegateway2">
<omgdi:waypoint x="815.0" y="337.5"/>
<omgdi:waypoint x="916.0" y="183.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12" sourceElement="exclusivegateway2" targetElement="endevent2">
<omgdi:waypoint x="948.0" y="183.0"/>
<omgdi:waypoint x="1040.0" y="184.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="956.0" y="187.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
src/main/resources/MoreSubProcessTestV2.bpmn deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn"
xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath"
id="m1585034942112" name="" targetNamespace="http://www.activiti.org/test"
typeLanguage="http://www.w3.org/2001/XMLSchema">
<process id="moreSubProcess" isClosed="false" isExecutable="true" name="moreSubProcess" processType="None">
<startEvent id="startevent1" name="Start"/>
<userTask activiti:assignee="${inputUser}" activiti:exclusive="true" id="startEntry" name="开始录入"/>
<userTask
activiti:candidateUsers="${groupDataStandardServiceImpl.findAssigneesForProcess(execution,&quot;group5&quot;)}"
activiti:exclusive="true" id="headApply" name="负责人审核"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway2" name="Exclusive Gateway"/>
<endEvent id="endevent2" name="End"/>
<userTask
activiti:candidateUsers="${groupDataStandardServiceImpl.findAssigneesForProcess(execution,&quot;group4&quot;)}"
activiti:exclusive="true" id="dataBackFlow" name="数据回流"/>
<sequenceFlow id="flow1" sourceRef="startevent1" targetRef="startEntry"/>
<sequenceFlow id="flow11" sourceRef="headApply" targetRef="exclusivegateway2"/>
<sequenceFlow id="flow12" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway2"
targetRef="endevent2"/>
<sequenceFlow id="flow13" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway2"
targetRef="dataBackFlow"/>
<sequenceFlow id="flow14" sourceRef="dataBackFlow" targetRef="endevent2"/>
<subProcess activiti:exclusive="true" id="entrySubprocess" name="录入子流程" triggeredByEvent="false">
<multiInstanceLoopCharacteristics activiti:collection="candiateUserList"
activiti:elementVariable="candiateUser" isSequential="false">
<completionCondition>
<!-- 这里表示当完成数和总数相等的时候到下一步 -->
<![CDATA[${nrOfCompletedInstances/nrOfInstances == 1}]]>
</completionCondition>
</multiInstanceLoopCharacteristics>
<startEvent id="startevent2" name="Start"/>
<userTask activiti:assignee="${candiateUser}" activiti:async="true" activiti:exclusive="true"
id="dataEntrySubTask" name="数据录入子任务"/>
<userTask activiti:assignee="${inputDataApply}" activiti:exclusive="true" id="dataApply" name="数据审核人员"/>
<endEvent id="endevent3" name="End"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway3" name="Exclusive Gateway"/>
<sequenceFlow id="flow17" sourceRef="startevent2" targetRef="dataEntrySubTask"/>
<sequenceFlow id="flow21" sourceRef="dataApply" targetRef="exclusivegateway3"/>
<sequenceFlow id="flow22" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway3"
targetRef="dataEntrySubTask"/>
<sequenceFlow id="flow23" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway3"
targetRef="endevent3"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway4" name="Exclusive Gateway"/>
<sequenceFlow id="flow24" sourceRef="dataEntrySubTask" targetRef="exclusivegateway4"/>
<sequenceFlow id="flow25" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway4"
targetRef="dataApply"/>
<sequenceFlow id="flow26" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway4"
targetRef="endevent3"/>
</subProcess>
<sequenceFlow id="flow15" sourceRef="startEntry" targetRef="entrySubprocess"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway5" name="Exclusive Gateway"/>
<sequenceFlow id="flow27" name="Y" skipExpression="${applySign=='true'}" sourceRef="exclusivegateway5"
targetRef="headApply"/>
<sequenceFlow id="flow28" sourceRef="entrySubprocess" targetRef="exclusivegateway5"/>
<sequenceFlow id="flow29" name="N" skipExpression="${applySign=='false'}" sourceRef="exclusivegateway5"
targetRef="dataBackFlow"/>
</process>
<bpmndi:BPMNDiagram
documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0"
id="Diagram-_1" name="New Diagram">
<bpmndi:BPMNPlane bpmnElement="moreSubProcess">
<bpmndi:BPMNShape bpmnElement="startevent1" id="Shape-startevent1">
<omgdc:Bounds height="32.0" width="32.0" x="40.0" y="5.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="startEntry" id="Shape-startEntry">
<omgdc:Bounds height="55.0" width="105.0" x="15.0" y="150.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="headApply" id="Shape-headApply">
<omgdc:Bounds height="55.0" width="105.0" x="710.0" y="310.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway2" id="Shape-exclusivegateway2" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="916.0" y="167.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="endevent2" id="Shape-endevent2">
<omgdc:Bounds height="32.0" width="32.0" x="1040.0" y="168.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataBackFlow" id="Shape-dataBackFlow">
<omgdc:Bounds height="55.0" width="105.0" x="880.0" y="-5.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="entrySubprocess" id="Shape-entrySubprocess" isExpanded="true">
<omgdc:Bounds height="205.0" width="421.0" x="200.0" y="77.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="205.0" width="421.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway5" id="Shape-exclusivegateway5" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="760.0" y="160.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="startevent2" id="Shape-startevent2">
<omgdc:Bounds height="32.0" width="32.0" x="210.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataEntrySubTask" id="Shape-dataEntrySubTask">
<omgdc:Bounds height="55.0" width="105.0" x="270.0" y="190.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataApply" id="Shape-dataApply">
<omgdc:Bounds height="55.0" width="105.0" x="380.0" y="120.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="endevent3" id="Shape-endevent3">
<omgdc:Bounds height="32.0" width="32.0" x="570.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway3" id="Shape-exclusivegateway3" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="510.0" y="127.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway4" id="Shape-exclusivegateway4" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="412.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow28" id="BPMNEdge_flow28" sourceElement="entrySubprocess"
targetElement="exclusivegateway5">
<omgdi:waypoint x="621.0" y="179.5"/>
<omgdi:waypoint x="760.0" y="176.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow29" id="BPMNEdge_flow29" sourceElement="exclusivegateway5"
targetElement="dataBackFlow">
<omgdi:waypoint x="775.0" y="161.0"/>
<omgdi:waypoint x="775.0" y="90.0"/>
<omgdi:waypoint x="880.0" y="22.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="700.0" y="166.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow24" id="BPMNEdge_flow24" sourceElement="dataEntrySubTask"
targetElement="exclusivegateway4">
<omgdi:waypoint x="375.0" y="217.5"/>
<omgdi:waypoint x="412.0" y="216.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow25" id="BPMNEdge_flow25" sourceElement="exclusivegateway4"
targetElement="dataApply">
<omgdi:waypoint x="428.0" y="200.0"/>
<omgdi:waypoint x="428.0" y="175.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="432.0" y="200.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow26" id="BPMNEdge_flow26" sourceElement="exclusivegateway4"
targetElement="endevent3">
<omgdi:waypoint x="444.0" y="216.0"/>
<omgdi:waypoint x="570.0" y="216.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="452.0" y="220.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow27" id="BPMNEdge_flow27" sourceElement="exclusivegateway5"
targetElement="headApply">
<omgdi:waypoint x="776.0" y="192.0"/>
<omgdi:waypoint x="776.0" y="310.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="720.0" y="186.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" sourceElement="startevent1"
targetElement="startEntry">
<omgdi:waypoint x="56.0" y="37.0"/>
<omgdi:waypoint x="56.0" y="150.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow21" id="BPMNEdge_flow21" sourceElement="dataApply"
targetElement="exclusivegateway3">
<omgdi:waypoint x="485.0" y="147.5"/>
<omgdi:waypoint x="510.0" y="143.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22" sourceElement="exclusivegateway3"
targetElement="dataEntrySubTask">
<omgdi:waypoint x="529.0" y="130.0"/>
<omgdi:waypoint x="529.0" y="89.0"/>
<omgdi:waypoint x="452.0" y="89.0"/>
<omgdi:waypoint x="322.0" y="89.0"/>
<omgdi:waypoint x="322.5" y="190.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="530.0" y="127.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow23" id="BPMNEdge_flow23" sourceElement="exclusivegateway3"
targetElement="endevent3">
<omgdi:waypoint x="538.0" y="147.0"/>
<omgdi:waypoint x="587.0" y="147.0"/>
<omgdi:waypoint x="587.0" y="200.0312805773287"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="550.0" y="147.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow17" id="BPMNEdge_flow17" sourceElement="startevent2"
targetElement="dataEntrySubTask">
<omgdi:waypoint x="242.0" y="216.0"/>
<omgdi:waypoint x="270.0" y="217.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow13" id="BPMNEdge_flow13" sourceElement="exclusivegateway2"
targetElement="dataBackFlow">
<omgdi:waypoint x="935.0" y="170.0"/>
<omgdi:waypoint x="935.0" y="95.0"/>
<omgdi:waypoint x="935.0" y="50.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="936.0" y="167.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14" sourceElement="dataBackFlow"
targetElement="endevent2">
<omgdi:waypoint x="985.0" y="30.0"/>
<omgdi:waypoint x="1060.0" y="30.0"/>
<omgdi:waypoint x="1060.0" y="-32.0"/>
<omgdi:waypoint x="1240.0" y="-32.0"/>
<omgdi:waypoint x="1060.0" y="168.50806661517032"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow15" id="BPMNEdge_flow15" sourceElement="startEntry"
targetElement="entrySubprocess">
<omgdi:waypoint x="120.0" y="177.5"/>
<omgdi:waypoint x="200.0" y="179.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11" sourceElement="headApply"
targetElement="exclusivegateway2">
<omgdi:waypoint x="815.0" y="337.5"/>
<omgdi:waypoint x="916.0" y="183.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12" sourceElement="exclusivegateway2"
targetElement="endevent2">
<omgdi:waypoint x="948.0" y="183.0"/>
<omgdi:waypoint x="1040.0" y="184.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="956.0" y="187.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
src/main/resources/SubProcessStandard.bpmn 0 → 100644
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn"
xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC"
xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/testm1585877478460"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
expressionLanguage="http://www.w3.org/1999/XPath" id="m1585877478460" name=""
targetNamespace="http://www.activiti.org/testm1585877478460"
typeLanguage="http://www.w3.org/2001/XMLSchema">
<process id="SubProcessStandard" isClosed="false" isExecutable="true" processType="None">
<startEvent id="StartEvent" name="StartEvent"/>
<subProcess activiti:exclusive="true" id="SubProcess" name="SubProcess" triggeredByEvent="false">
<multiInstanceLoopCharacteristics activiti:collection="groups" activiti:elementVariable="group"
isSequential="false">
<completionCondition>
<![CDATA[${nrOfCompletedInstances/nrOfInstances == 1}]]>
</completionCondition>
</multiInstanceLoopCharacteristics>
<startEvent id="_5" name="StartEvent"/>
<userTask activiti:candidateGroups="${group}" activiti:exclusive="true" id="DataEnter" name="UserTask"/>
<sequenceFlow id="_7" sourceRef="_5" targetRef="DataEnter"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_8" name="ExclusiveGateway"/>
<userTask activiti:assignee="${auditUser}" activiti:exclusive="true" id="DataAudit" name="UserTask"/>
<sequenceFlow id="_10" sourceRef="DataEnter" targetRef="_8"/>
<sequenceFlow id="_11" sourceRef="_8" targetRef="DataAudit">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[
]]>
</conditionExpression>
</sequenceFlow>
<endEvent id="_12" name="EndEvent"/>
<sequenceFlow id="_13" sourceRef="_8" targetRef="_12">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[
]]>
</conditionExpression>
</sequenceFlow>
<exclusiveGateway gatewayDirection="Unspecified" id="_14" name="ExclusiveGateway"/>
<sequenceFlow id="_15" sourceRef="DataAudit" targetRef="_14"/>
<sequenceFlow id="_16" sourceRef="_14" targetRef="DataEnter">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[
]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_17" sourceRef="_14" targetRef="_12">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[
]]>
</conditionExpression>
</sequenceFlow>
</subProcess>
<sequenceFlow id="_4" sourceRef="StartEvent" targetRef="SubProcess"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_18" name="ExclusiveGateway"/>
<sequenceFlow id="_2" sourceRef="SubProcess" targetRef="_18"/>
<userTask activiti:assignee="${manager}" activiti:exclusive="true" id="ManagerConfirm" name="UserTask"/>
<endEvent id="_6" name="EndEvent"/>
<sequenceFlow id="_9" sourceRef="_18" targetRef="_6">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${NeedConfirm == false}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_19" sourceRef="_18" targetRef="ManagerConfirm">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${NeedConfirm == true}]]>
</conditionExpression>
</sequenceFlow>
<exclusiveGateway gatewayDirection="Unspecified" id="_20" name="ExclusiveGateway"/>
<sequenceFlow id="_21" sourceRef="ManagerConfirm" targetRef="_20"/>
<sequenceFlow id="_22" sourceRef="_20" targetRef="_6">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${Confirm == true}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_23" sourceRef="_20" targetRef="SubProcess">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${Confirm == false}]]>
</conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram
documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0"
id="Diagram-_1" name="New Diagram">
<bpmndi:BPMNPlane bpmnElement="SubProcessStandard">
<bpmndi:BPMNShape bpmnElement="StartEvent" id="Shape-StartEvent">
<dc:Bounds height="32.0" width="32.0" x="25.0" y="165.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="SubProcess" id="Shape-SubProcess" isExpanded="true">
<dc:Bounds height="260.0" width="345.0" x="95.0" y="85.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="260.0" width="345.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_18" id="Shape-_18" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="510.0" y="200.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="ManagerConfirm" id="Shape-ManagerConfirm">
<dc:Bounds height="55.0" width="85.0" x="485.0" y="270.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_6" id="Shape-_6">
<dc:Bounds height="32.0" width="32.0" x="635.0" y="400.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_20" id="Shape-_20" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="510.0" y="355.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
<dc:Bounds height="32.0" width="32.0" x="110.0" y="110.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DataEnter" id="Shape-DataEnter">
<dc:Bounds height="55.0" width="85.0" x="175.0" y="105.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_8" id="Shape-_8" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="315.0" y="110.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DataAudit" id="Shape-DataAudit">
<dc:Bounds height="55.0" width="85.0" x="270.0" y="190.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_12" id="Shape-_12">
<dc:Bounds height="32.0" width="32.0" x="320.0" y="285.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_14" id="Shape-_14" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="190.0" y="200.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="_8" targetElement="_12">
<di:waypoint x="347.0" y="126.0"/>
<di:waypoint x="415.0" y="215.0"/>
<di:waypoint x="352.0" y="301.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_15" id="BPMNEdge__15" sourceElement="DataAudit" targetElement="_14">
<di:waypoint x="270.0" y="217.5"/>
<di:waypoint x="222.0" y="216.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_17" id="BPMNEdge__17" sourceElement="_14" targetElement="_12">
<di:waypoint x="205.0" y="231.0"/>
<di:waypoint x="205.0" y="300.0"/>
<di:waypoint x="320.0312805773287" y="300.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_16" id="BPMNEdge__16" sourceElement="_14" targetElement="DataEnter">
<di:waypoint x="206.0" y="200.0"/>
<di:waypoint x="206.0" y="160.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_19" id="BPMNEdge__19" sourceElement="_18" targetElement="_3">
<di:waypoint x="526.0" y="232.0"/>
<di:waypoint x="526.0" y="270.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_22" id="BPMNEdge__22" sourceElement="_20" targetElement="_6">
<di:waypoint x="525.0" y="386.0"/>
<di:waypoint x="525.0" y="490.0"/>
<di:waypoint x="651.0" y="432.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_21" id="BPMNEdge__21" sourceElement="_3" targetElement="_20">
<di:waypoint x="526.0" y="325.0"/>
<di:waypoint x="526.0" y="355.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_23" id="BPMNEdge__23" sourceElement="_20" targetElement="SubProcess">
<di:waypoint x="510.0" y="371.0"/>
<di:waypoint x="440.0" y="215.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_2" id="BPMNEdge__2" sourceElement="SubProcess" targetElement="_18">
<di:waypoint x="440.0" y="215.0"/>
<di:waypoint x="510.0" y="216.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_4" id="BPMNEdge__4" sourceElement="StartEvent" targetElement="SubProcess">
<di:waypoint x="57.0" y="181.0"/>
<di:waypoint x="95.0" y="215.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="_5" targetElement="DataEnter">
<di:waypoint x="142.0" y="126.0"/>
<di:waypoint x="175.0" y="132.5"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_9" id="BPMNEdge__9" sourceElement="_18" targetElement="_6">
<di:waypoint x="542.0" y="216.0"/>
<di:waypoint x="655.0" y="320.0"/>
<di:waypoint x="655.0" y="400.5080666151703"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_11" id="BPMNEdge__11" sourceElement="_8" targetElement="DataAudit">
<di:waypoint x="331.0" y="142.0"/>
<di:waypoint x="331.0" y="190.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_10" id="BPMNEdge__10" sourceElement="DataEnter" targetElement="_8">
<di:waypoint x="260.0" y="132.5"/>
<di:waypoint x="315.0" y="126.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
src/main/resources/application-test.yml
...@@ -6,7 +6,7 @@ eureka: ...@@ -6,7 +6,7 @@ eureka:
region: default region: default
serviceUrl: serviceUrl:
defaultZone: http://192.168.0.240:8081/eureka/ defaultZone: http://192.168.0.240:8081/eureka/
enabled: true enabled: false
instance: instance:
prefer-ip-address: false prefer-ip-address: false
# hostname: 192.168.0.48 # hostname: 192.168.0.48
...@@ -31,9 +31,9 @@ spring: ...@@ -31,9 +31,9 @@ spring:
url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: test username: test
password: test password: test
# url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
# username: root # username: root
# password: 123456 # password: 123456
hikari: hikari:
maximum-pool-size: 3 maximum-pool-size: 3
servlet: servlet:
...@@ -62,5 +62,5 @@ swagger2: ...@@ -62,5 +62,5 @@ swagger2:
security: security:
authUser: root authUser: root
authPwd: pwd authPwd: pwd
permit: false # permit: false
# permit: true permit: true
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment