增项 年审入库可驳回

src/main/java/com/common/workflow/service/activiti/contractAnnualEvaluationListener/EvaluateApprovalRefuseTaskService.java

@@ -16,7 +16,7 @@ public class EvaluateApprovalRefuseTaskService implements TaskListener {
             delegateTask.setVariable("users", backUsers);
             delegateTask.setVariableLocal("users", backUsers);
             delegateTask.addCandidateUsers(Arrays.asList(backUsers.split(",")));
-            System.out.println("合同年度评审 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
+            System.out.println("合同年度 评审 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
         }
     }
 }

src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualWorkflowEndService.java

@@ -9,13 +9,13 @@ import org.activiti.engine.delegate.TaskListener;
 import org.springframework.stereotype.Component;
 
 @Component("annualWorkflowEndService")
-public class AnnualWorkflowEndService implements TaskListener {
+public class AnnualWorkflowEndService implements ExecutionListener {
     // 企业法规处审批入库完成
     @Override
-    public void notify(DelegateTask delegateTask) {
-        String callbackUrl = delegateTask.getVariable("callbackUrl").toString();
+    public void notify(DelegateExecution delegateExecution) {
+        String callbackUrl = delegateExecution.getVariable("callbackUrl").toString();
         // String processKey = delegateTask.getVariable("processKey").toString();
-        String businessKey = delegateTask.getVariable("businessKey").toString();
+        String businessKey = delegateExecution.getVariable("businessKey").toString();
 
         String approveUrl = callbackUrl + "/annual-listener/workflow-end";
 

src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendWorkflowEndService.java

@@ -9,13 +9,13 @@ import org.activiti.engine.delegate.TaskListener;
 import org.springframework.stereotype.Component;
 
 @Component("appendWorkflowEndService")
-public class AppendWorkflowEndService implements TaskListener {
+public class AppendWorkflowEndService implements ExecutionListener {
     // 企业法规处审批入库完成
     @Override
-    public void notify(DelegateTask delegateTask) {
-        String callbackUrl = delegateTask.getVariable("callbackUrl").toString();
+    public void notify(DelegateExecution delegateExecution) {
+        String callbackUrl = delegateExecution.getVariable("callbackUrl").toString();
         // String processKey = delegateTask.getVariable("processKey").toString();
-        String businessKey = delegateTask.getVariable("businessKey").toString();
+        String businessKey = delegateExecution.getVariable("businessKey").toString();
 
         String approveUrl = callbackUrl + "/suppliercert-append-listener/workflow-end";
 

src/main/resources/processes/oil_audit_apply.bpmn20.xml

@@ -41,10 +41,8 @@
         <userTask id="sid-C633703C-7627-495A-AFDA-0CE56BDF3BD0" name="企管法规处入库" activiti:candidateUsers="${users}">
             <extensionElements>
                 <activiti:taskListener event="create" delegateExpression="${annualPreStorageAuditService}"></activiti:taskListener>
-                <activiti:taskListener event="complete" delegateExpression="${annualWorkflowEndService}"></activiti:taskListener>
             </extensionElements>
         </userTask>
-        <sequenceFlow id="sid-12826012-AA6E-4256-8FE6-96B80595661A" sourceRef="sid-C633703C-7627-495A-AFDA-0CE56BDF3BD0" targetRef="sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B"></sequenceFlow>
         <sequenceFlow id="sid-F39813FF-6716-4BE5-8769-9D8B434D2B62" name="二级单位提交" sourceRef="sid-9A4454BD-9A0F-4B81-B482-BA2179020366" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
         </sequenceFlow>
@@ -73,16 +71,6 @@
                 <activiti:taskListener event="create" delegateExpression="${approvalRefuseTaskService}"></activiti:taskListener>
             </extensionElements>
         </userTask>
-        <sequenceFlow id="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" name="不通过" sourceRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" targetRef="sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD">
-            <extensionElements>
-                <activiti:executionListener event="start" delegateExpression="${annualApprovalRefuseService}">
-                    <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-5]]></activiti:string>
-                    </activiti:field>
-                </activiti:executionListener>
-            </extensionElements>
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-        </sequenceFlow>
         <sequenceFlow id="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" name="不通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${annualApprovalRefuseService}">
@@ -114,129 +102,168 @@
         <sequenceFlow id="sid-0D651924-83DC-4FB8-ACE1-83A5FEA3648C" name="通过" sourceRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D" targetRef="sid-DEDBD6B6-5348-494A-A212-18A171193232">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
+        <exclusiveGateway id="sid-68024297-6520-480A-9F07-D857C40CCDE4"></exclusiveGateway>
+        <sequenceFlow id="sid-4F36C349-7943-403B-B56A-01F0A0329FAB" sourceRef="sid-C633703C-7627-495A-AFDA-0CE56BDF3BD0" targetRef="sid-68024297-6520-480A-9F07-D857C40CCDE4"></sequenceFlow>
+        <sequenceFlow id="sid-12826012-AA6E-4256-8FE6-96B80595661A" sourceRef="sid-68024297-6520-480A-9F07-D857C40CCDE4" targetRef="sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${annualWorkflowEndService}"></activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" name="不通过" sourceRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" targetRef="sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${annualApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-5]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-9F23B78D-4EF7-48AB-A2D1-90B26C53EA21" sourceRef="sid-68024297-6520-480A-9F07-D857C40CCDE4" targetRef="sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${annualApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-7]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+        </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_audit_apply">
         <bpmndi:BPMNPlane bpmnElement="oil_audit_apply" id="BPMNPlane_oil_audit_apply">
             <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
-                <omgdc:Bounds height="30.0" width="30.0" x="0.0" y="163.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="30.0" width="30.0" x="180.0" y="643.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B" id="BPMNShape_sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B">
-                <omgdc:Bounds height="28.0" width="28.0" x="1410.0" y="165.0"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="1665.0000000000002" y="644.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-D5765623-E20C-4774-9303-488697382FC8" id="BPMNShape_sid-D5765623-E20C-4774-9303-488697382FC8">
-                <omgdc:Bounds height="80.0" width="100.0" x="465.0" y="138.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="645.0" y="618.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" id="BPMNShape_sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE">
-                <omgdc:Bounds height="40.0" width="40.0" x="600.0" y="158.00000000000043"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="780.0" y="638.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" id="BPMNShape_sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9">
-                <omgdc:Bounds height="80.0" width="100.0" x="675.0" y="138.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="855.0" y="618.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-0B124434-FDAD-4E82-91CB-E570A44E7FF3" id="BPMNShape_sid-0B124434-FDAD-4E82-91CB-E570A44E7FF3">
-                <omgdc:Bounds height="80.00000000000003" width="100.0" x="65.0" y="138.99999999999997"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="245.0" y="619.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8" id="BPMNShape_sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8">
-                <omgdc:Bounds height="80.0" width="100.0" x="315.0" y="138.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="495.0" y="618.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D" id="BPMNShape_sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D">
-                <omgdc:Bounds height="40.0" width="40.0" x="810.0" y="158.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="990.0" y="638.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-DEDBD6B6-5348-494A-A212-18A171193232" id="BPMNShape_sid-DEDBD6B6-5348-494A-A212-18A171193232">
-                <omgdc:Bounds height="80.0" width="100.0" x="900.0" y="138.00000000000043"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1080.0" y="618.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-9A4454BD-9A0F-4B81-B482-BA2179020366" id="BPMNShape_sid-9A4454BD-9A0F-4B81-B482-BA2179020366">
-                <omgdc:Bounds height="40.0" width="40.0" x="205.0" y="158.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="385.0" y="638.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" id="BPMNShape_sid-B93E1164-9FAC-4D21-A691-2A4411C35635">
-                <omgdc:Bounds height="40.0" width="40.0" x="1032.0" y="158.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1212.0" y="638.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-50701969-FF27-4BDF-91F2-90BB786BA878" id="BPMNShape_sid-50701969-FF27-4BDF-91F2-90BB786BA878">
-                <omgdc:Bounds height="80.0" width="100.0" x="1117.0" y="138.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1297.0" y="618.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-C633703C-7627-495A-AFDA-0CE56BDF3BD0" id="BPMNShape_sid-C633703C-7627-495A-AFDA-0CE56BDF3BD0">
-                <omgdc:Bounds height="80.0" width="100.0" x="1262.0" y="138.0000000000004"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1442.0" y="618.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD" id="BPMNShape_sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD">
-                <omgdc:Bounds height="80.0" width="100.0" x="175.0" y="240.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="355.0" y="720.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-68024297-6520-480A-9F07-D857C40CCDE4" id="BPMNShape_sid-68024297-6520-480A-9F07-D857C40CCDE4">
+                <omgdc:Bounds height="40.0" width="40.0" x="1587.0" y="638.0000000000005"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNEdge bpmnElement="sid-0D651924-83DC-4FB8-ACE1-83A5FEA3648C" id="BPMNEdge_sid-0D651924-83DC-4FB8-ACE1-83A5FEA3648C">
-                <omgdi:waypoint x="849.5798319327731" y="178.42016806722728"></omgdi:waypoint>
-                <omgdi:waypoint x="900.0" y="178.2092050209209"></omgdi:waypoint>
+                <omgdi:waypoint x="1029.579831932773" y="658.4201680672273"></omgdi:waypoint>
+                <omgdi:waypoint x="1080.0" y="658.209205020921"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-61B018D5-F555-4470-9A3E-28B98071D345" id="BPMNEdge_sid-61B018D5-F555-4470-9A3E-28B98071D345">
-                <omgdi:waypoint x="225.0" y="240.0"></omgdi:waypoint>
-                <omgdi:waypoint x="225.0" y="198.0000000000004"></omgdi:waypoint>
+                <omgdi:waypoint x="405.0" y="720.0"></omgdi:waypoint>
+                <omgdi:waypoint x="405.0" y="678.0000000000005"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2F6390F0-B470-4949-965D-F95510CF8844" id="BPMNEdge_sid-2F6390F0-B470-4949-965D-F95510CF8844">
-                <omgdi:waypoint x="1052.5" y="158.5000000000004"></omgdi:waypoint>
-                <omgdi:waypoint x="1052.5" y="117.01628112792969"></omgdi:waypoint>
-                <omgdi:waypoint x="1312.0" y="117.01628112792969"></omgdi:waypoint>
-                <omgdi:waypoint x="1312.0" y="138.0000000000004"></omgdi:waypoint>
+                <omgdi:waypoint x="1232.5" y="638.5000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="1232.5" y="597.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="1492.0" y="597.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="1492.0" y="618.0000000000005"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-F39CE67A-02DA-44CB-A534-968088FC5F18" id="BPMNEdge_sid-F39CE67A-02DA-44CB-A534-968088FC5F18">
-                <omgdi:waypoint x="830.5" y="197.5000000000004"></omgdi:waypoint>
-                <omgdi:waypoint x="830.5" y="280.0"></omgdi:waypoint>
-                <omgdi:waypoint x="275.0" y="280.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1010.5" y="677.5000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="1010.5" y="760.0"></omgdi:waypoint>
+                <omgdi:waypoint x="455.0" y="760.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-4FDD2371-4005-422A-8183-71F35A0A0808" id="BPMNEdge_sid-4FDD2371-4005-422A-8183-71F35A0A0808">
-                <omgdi:waypoint x="1071.5833333333333" y="178.41666666666706"></omgdi:waypoint>
-                <omgdi:waypoint x="1117.0" y="178.2183406113541"></omgdi:waypoint>
+                <omgdi:waypoint x="1251.5833333333333" y="658.4166666666671"></omgdi:waypoint>
+                <omgdi:waypoint x="1297.0" y="658.2183406113542"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-1E9A7C43-FEF5-4D45-A307-0430AA71DB12" id="BPMNEdge_sid-1E9A7C43-FEF5-4D45-A307-0430AA71DB12">
-                <omgdi:waypoint x="244.568345323741" y="178.4316546762594"></omgdi:waypoint>
-                <omgdi:waypoint x="315.0" y="178.17921146953444"></omgdi:waypoint>
+                <omgdi:waypoint x="424.568345323741" y="658.4316546762594"></omgdi:waypoint>
+                <omgdi:waypoint x="495.0" y="658.1792114695345"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-9F23B78D-4EF7-48AB-A2D1-90B26C53EA21" id="BPMNEdge_sid-9F23B78D-4EF7-48AB-A2D1-90B26C53EA21">
+                <omgdi:waypoint x="1607.5" y="677.5000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="1607.5" y="760.0"></omgdi:waypoint>
+                <omgdi:waypoint x="455.0" y="760.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-4F36C349-7943-403B-B56A-01F0A0329FAB" id="BPMNEdge_sid-4F36C349-7943-403B-B56A-01F0A0329FAB">
+                <omgdi:waypoint x="1542.0" y="658.2164502164507"></omgdi:waypoint>
+                <omgdi:waypoint x="1587.4130434782608" y="658.4130434782613"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-F39813FF-6716-4BE5-8769-9D8B434D2B62" id="BPMNEdge_sid-F39813FF-6716-4BE5-8769-9D8B434D2B62">
-                <omgdi:waypoint x="225.5" y="158.5000000000004"></omgdi:waypoint>
-                <omgdi:waypoint x="225.5" y="107.01447296142578"></omgdi:waypoint>
-                <omgdi:waypoint x="515.0" y="107.01447296142578"></omgdi:waypoint>
-                <omgdi:waypoint x="515.0" y="138.0000000000004"></omgdi:waypoint>
+                <omgdi:waypoint x="405.5" y="638.5000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="405.5" y="587.0144729614258"></omgdi:waypoint>
+                <omgdi:waypoint x="695.0" y="587.0144729614258"></omgdi:waypoint>
+                <omgdi:waypoint x="695.0" y="618.0000000000005"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D779A6CC-563C-4A97-ADE7-1B669C622454" id="BPMNEdge_sid-D779A6CC-563C-4A97-ADE7-1B669C622454">
-                <omgdi:waypoint x="165.0" y="178.77375565610876"></omgdi:waypoint>
-                <omgdi:waypoint x="205.59009009009003" y="178.59009009009043"></omgdi:waypoint>
+                <omgdi:waypoint x="345.0" y="658.7737556561088"></omgdi:waypoint>
+                <omgdi:waypoint x="385.59009009009003" y="658.5900900900905"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-827D17FF-B71A-4CEF-8E35-B742839FDE94" id="BPMNEdge_sid-827D17FF-B71A-4CEF-8E35-B742839FDE94">
-                <omgdi:waypoint x="1217.0" y="178.0000000000004"></omgdi:waypoint>
-                <omgdi:waypoint x="1262.0" y="178.0000000000004"></omgdi:waypoint>
+                <omgdi:waypoint x="1397.0" y="658.0000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="1442.0" y="658.0000000000005"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" id="BPMNEdge_sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163">
-                <omgdi:waypoint x="620.5555419921875" y="197.44445800781293"></omgdi:waypoint>
-                <omgdi:waypoint x="620.5555419921875" y="280.0"></omgdi:waypoint>
-                <omgdi:waypoint x="275.0" y="280.0"></omgdi:waypoint>
+                <omgdi:waypoint x="800.5555419921875" y="677.444458007813"></omgdi:waypoint>
+                <omgdi:waypoint x="800.5555419921875" y="760.0"></omgdi:waypoint>
+                <omgdi:waypoint x="455.0" y="760.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" id="BPMNEdge_sid-0F7FB010-0A59-4862-8046-36C4B320FB28">
-                <omgdi:waypoint x="1052.5" y="197.5000000000004"></omgdi:waypoint>
-                <omgdi:waypoint x="1052.5" y="280.0"></omgdi:waypoint>
-                <omgdi:waypoint x="275.0" y="280.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1232.5" y="677.5000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="1232.5" y="760.0"></omgdi:waypoint>
+                <omgdi:waypoint x="455.0" y="760.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" id="BPMNEdge_sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A">
-                <omgdi:waypoint x="1000.0" y="178.2439024390248"></omgdi:waypoint>
-                <omgdi:waypoint x="1032.4019607843138" y="178.40196078431413"></omgdi:waypoint>
+                <omgdi:waypoint x="1180.0" y="658.2439024390249"></omgdi:waypoint>
+                <omgdi:waypoint x="1212.4019607843138" y="658.4019607843142"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-37BD7150-CF5D-4AA6-982D-B305AE720F99" id="BPMNEdge_sid-37BD7150-CF5D-4AA6-982D-B305AE720F99">
-                <omgdi:waypoint x="775.0" y="178.23696682464495"></omgdi:waypoint>
-                <omgdi:waypoint x="810.4047619047619" y="178.4047619047623"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-12826012-AA6E-4256-8FE6-96B80595661A" id="BPMNEdge_sid-12826012-AA6E-4256-8FE6-96B80595661A">
-                <omgdi:waypoint x="1362.0" y="178.44642857142878"></omgdi:waypoint>
-                <omgdi:waypoint x="1410.000558002352" y="178.87500498216392"></omgdi:waypoint>
+                <omgdi:waypoint x="955.0" y="658.236966824645"></omgdi:waypoint>
+                <omgdi:waypoint x="990.4047619047619" y="658.4047619047624"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-F79F4B30-54D3-445C-8761-786B5151F0DC" id="BPMNEdge_sid-F79F4B30-54D3-445C-8761-786B5151F0DC">
-                <omgdi:waypoint x="29.999250056245316" y="178.14999250056277"></omgdi:waypoint>
-                <omgdi:waypoint x="65.0" y="178.5000000000002"></omgdi:waypoint>
+                <omgdi:waypoint x="209.9992500562453" y="658.1499925005628"></omgdi:waypoint>
+                <omgdi:waypoint x="245.0" y="658.5000000000002"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" id="BPMNEdge_sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46">
-                <omgdi:waypoint x="565.0" y="178.23696682464498"></omgdi:waypoint>
-                <omgdi:waypoint x="600.4047619047619" y="178.40476190476232"></omgdi:waypoint>
+                <omgdi:waypoint x="745.0" y="658.236966824645"></omgdi:waypoint>
+                <omgdi:waypoint x="780.4047619047619" y="658.4047619047624"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-12826012-AA6E-4256-8FE6-96B80595661A" id="BPMNEdge_sid-12826012-AA6E-4256-8FE6-96B80595661A">
+                <omgdi:waypoint x="1626.6338028169014" y="658.3661971830991"></omgdi:waypoint>
+                <omgdi:waypoint x="1665.0003423024734" y="658.097899704179"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D8EF8E5C-09F6-447F-8D74-3487CC461350" id="BPMNEdge_sid-D8EF8E5C-09F6-447F-8D74-3487CC461350">
-                <omgdi:waypoint x="415.0" y="178.0000000000004"></omgdi:waypoint>
-                <omgdi:waypoint x="465.0" y="178.0000000000004"></omgdi:waypoint>
+                <omgdi:waypoint x="595.0" y="658.0000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="645.0" y="658.0000000000005"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-002682E5-FF90-4A74-8707-0F8B98C09674" id="BPMNEdge_sid-002682E5-FF90-4A74-8707-0F8B98C09674">
-                <omgdi:waypoint x="639.5913461538462" y="178.40865384615427"></omgdi:waypoint>
-                <omgdi:waypoint x="675.0" y="178.23923444976117"></omgdi:waypoint>
+                <omgdi:waypoint x="819.5913461538462" y="658.4086538461543"></omgdi:waypoint>
+                <omgdi:waypoint x="855.0" y="658.2392344497612"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
         </bpmndi:BPMNPlane>
     </bpmndi:BPMNDiagram>

src/main/resources/processes/oil_enuser_append_apply.bpmn20.xml

@@ -46,10 +46,8 @@
         <userTask id="sid-3EA02700-4143-4282-A6C2-08CE0F38E76C" name="企管法规处入库" activiti:candidateUsers="${users}">
             <extensionElements>
                 <activiti:taskListener event="create" delegateExpression="${appendPreStorageAuditService}"></activiti:taskListener>
-                <activiti:taskListener event="complete" delegateExpression="${appendWorkflowEndService}"></activiti:taskListener>
             </extensionElements>
         </userTask>
-        <sequenceFlow id="sid-3A36FF73-424D-4C84-9519-826C52CC9091" sourceRef="sid-3EA02700-4143-4282-A6C2-08CE0F38E76C" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></sequenceFlow>
         <exclusiveGateway id="sid-ACC9707A-EFE4-4980-988B-5F87083CE851"></exclusiveGateway>
         <sequenceFlow id="sid-D5B0EDC0-E1F6-4DF3-8769-47C8468EFED2" sourceRef="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E" targetRef="sid-ACC9707A-EFE4-4980-988B-5F87083CE851"></sequenceFlow>
         <sequenceFlow id="sid-5DF00195-C2A6-4F61-A585-A29C83728B82" name="二级单位申请" sourceRef="sid-ACC9707A-EFE4-4980-988B-5F87083CE851" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
@@ -74,6 +72,19 @@
         <sequenceFlow id="sid-67A5C40B-EF7D-42AC-8543-BC1E0CB1BDE2" name="企业用户申请" sourceRef="sid-ACC9707A-EFE4-4980-988B-5F87083CE851" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
+        <sequenceFlow id="sid-F5F08BDE-2393-4D89-85D3-C40C6199CF5B" name="通过" sourceRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B" targetRef="sid-7D1F719F-8AF4-449E-BD5E-767BCFDA0B77">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-DE214B02-7077-42D9-99ED-6263C21BBBDE" name="通过不交费" sourceRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B" targetRef="sid-3EA02700-4143-4282-A6C2-08CE0F38E76C">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
+        </sequenceFlow>
+        <userTask id="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054" name="审核未通过" activiti:candidateUsers="${users}">
+            <extensionElements>
+                <activiti:taskListener event="create" delegateExpression="${approvalRefuseTaskService}"></activiti:taskListener>
+            </extensionElements>
+        </userTask>
+        <sequenceFlow id="sid-4C52C3E7-9EEF-4D1F-9EF2-56C9F94FFB95" sourceRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054" targetRef="sid-ACC9707A-EFE4-4980-988B-5F87083CE851"></sequenceFlow>
+        <exclusiveGateway id="sid-5FCFE3C4-8813-4238-8117-05B14EB95C66"></exclusiveGateway>
         <sequenceFlow id="sid-AA46B27B-7C3C-4586-BB9D-28AC48B16F5E" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${appendApprovalRefuseService}">
@@ -84,168 +95,185 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-8E11FCEE-5E6E-4C47-84E1-448933CB3E94" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
+        <sequenceFlow id="sid-E20D16A1-7AC4-40EF-BAA3-FC171BF0F8D3" name="不通过" sourceRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${appendApprovalRefuseService}">
                     <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-2]]></activiti:string>
+                        <activiti:string><![CDATA[-4]]></activiti:string>
                     </activiti:field>
                 </activiti:executionListener>
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-E20D16A1-7AC4-40EF-BAA3-FC171BF0F8D3" name="不通过" sourceRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
+        <sequenceFlow id="sid-74A32C66-1FC4-44F8-BF30-DD3802882E87" sourceRef="sid-3EA02700-4143-4282-A6C2-08CE0F38E76C" targetRef="sid-5FCFE3C4-8813-4238-8117-05B14EB95C66"></sequenceFlow>
+        <sequenceFlow id="sid-3A36FF73-424D-4C84-9519-826C52CC9091" sourceRef="sid-5FCFE3C4-8813-4238-8117-05B14EB95C66" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${appendWorkflowEndService}"></activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-8E11FCEE-5E6E-4C47-84E1-448933CB3E94" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${appendApprovalRefuseService}">
                     <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-4]]></activiti:string>
+                        <activiti:string><![CDATA[-2]]></activiti:string>
                     </activiti:field>
                 </activiti:executionListener>
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-F5F08BDE-2393-4D89-85D3-C40C6199CF5B" name="通过" sourceRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B" targetRef="sid-7D1F719F-8AF4-449E-BD5E-767BCFDA0B77">
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-        </sequenceFlow>
-        <sequenceFlow id="sid-DE214B02-7077-42D9-99ED-6263C21BBBDE" name="通过不交费" sourceRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B" targetRef="sid-3EA02700-4143-4282-A6C2-08CE0F38E76C">
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
-        </sequenceFlow>
-        <userTask id="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054" name="审核未通过" activiti:candidateUsers="${users}">
+        <sequenceFlow id="sid-1FB3F13D-0A2A-42A9-8B84-8EEE11D92C5C" sourceRef="sid-5FCFE3C4-8813-4238-8117-05B14EB95C66" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
             <extensionElements>
-                <activiti:taskListener event="create" delegateExpression="${approvalRefuseTaskService}"></activiti:taskListener>
+                <activiti:executionListener event="start" delegateExpression="${appendApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-7]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
             </extensionElements>
-        </userTask>
-        <sequenceFlow id="sid-4C52C3E7-9EEF-4D1F-9EF2-56C9F94FFB95" sourceRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054" targetRef="sid-ACC9707A-EFE4-4980-988B-5F87083CE851"></sequenceFlow>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_enuser_append_apply">
         <bpmndi:BPMNPlane bpmnElement="oil_enuser_append_apply" id="BPMNPlane_oil_enuser_append_apply">
             <bpmndi:BPMNShape bpmnElement="sid-9A4918D7-8376-4A00-928A-6415D92565EC" id="BPMNShape_sid-9A4918D7-8376-4A00-928A-6415D92565EC">
-                <omgdc:Bounds height="30.0" width="30.0" x="55.0" y="280.0"></omgdc:Bounds>
+                <omgdc:Bounds height="30.0" width="30.0" x="275.0" y="280.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" id="BPMNShape_sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-                <omgdc:Bounds height="80.0" width="100.0" x="355.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="575.0" y="255.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" id="BPMNShape_sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
-                <omgdc:Bounds height="79.99999999999994" width="100.0" x="1030.0" y="255.00000000000006"></omgdc:Bounds>
+                <omgdc:Bounds height="79.99999999999994" width="100.0" x="1250.0" y="255.00000000000006"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" id="BPMNShape_sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
-                <omgdc:Bounds height="80.0" width="99.99999999999989" x="700.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="920.0" y="255.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-E178BD57-68C0-4C23-8952-143905257209" id="BPMNShape_sid-E178BD57-68C0-4C23-8952-143905257209">
-                <omgdc:Bounds height="40.0" width="40.0" x="820.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1040.0" y="275.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" id="BPMNShape_sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
-                <omgdc:Bounds height="79.99999999999997" width="100.0" x="490.0" y="255.00000000000003"></omgdc:Bounds>
+                <omgdc:Bounds height="79.99999999999997" width="100.0" x="710.0" y="255.00000000000003"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" id="BPMNShape_sid-C9D007EC-DA5F-480E-A280-EBF70615C514">
-                <omgdc:Bounds height="40.0" width="40.0" x="625.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="845.0" y="275.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D" id="BPMNShape_sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
-                <omgdc:Bounds height="28.0" width="28.0" x="1540.0" y="281.0"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="1840.0" y="281.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" id="BPMNShape_sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
-                <omgdc:Bounds height="80.0" width="100.0" x="895.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1115.0" y="255.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E" id="BPMNShape_sid-F49D476A-2CDD-4A35-8212-D88BA71F604E">
-                <omgdc:Bounds height="80.0" width="100.0" x="120.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="340.0" y="255.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-23C9D008-0522-4173-924B-616B0B9E2A1B" id="BPMNShape_sid-23C9D008-0522-4173-924B-616B0B9E2A1B">
-                <omgdc:Bounds height="40.0" width="40.0" x="1160.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1380.0" y="275.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-7D1F719F-8AF4-449E-BD5E-767BCFDA0B77" id="BPMNShape_sid-7D1F719F-8AF4-449E-BD5E-767BCFDA0B77">
-                <omgdc:Bounds height="80.0" width="100.0" x="1245.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1465.0" y="255.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-3EA02700-4143-4282-A6C2-08CE0F38E76C" id="BPMNShape_sid-3EA02700-4143-4282-A6C2-08CE0F38E76C">
-                <omgdc:Bounds height="80.0" width="100.0" x="1390.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1610.0" y="255.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-ACC9707A-EFE4-4980-988B-5F87083CE851" id="BPMNShape_sid-ACC9707A-EFE4-4980-988B-5F87083CE851">
-                <omgdc:Bounds height="40.0" width="40.0" x="265.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="485.0" y="275.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054" id="BPMNShape_sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
-                <omgdc:Bounds height="80.0" width="100.0" x="235.0" y="360.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="455.0" y="360.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-5FCFE3C4-8813-4238-8117-05B14EB95C66" id="BPMNShape_sid-5FCFE3C4-8813-4238-8117-05B14EB95C66">
+                <omgdc:Bounds height="40.0" width="40.0" x="1755.0" y="275.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNEdge bpmnElement="sid-BE646B05-EF10-4029-BC3B-BCABCFF884B1" id="BPMNEdge_sid-BE646B05-EF10-4029-BC3B-BCABCFF884B1">
-                <omgdi:waypoint x="1130.0" y="295.00970873786406"></omgdi:waypoint>
-                <omgdi:waypoint x="1160.3039215686274" y="295.30392156862746"></omgdi:waypoint>
+                <omgdi:waypoint x="1350.0" y="295.00970873786406"></omgdi:waypoint>
+                <omgdi:waypoint x="1380.3039215686274" y="295.30392156862746"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
-                <omgdi:waypoint x="590.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="625.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="810.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="845.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-4C52C3E7-9EEF-4D1F-9EF2-56C9F94FFB95" id="BPMNEdge_sid-4C52C3E7-9EEF-4D1F-9EF2-56C9F94FFB95">
-                <omgdi:waypoint x="285.0" y="360.0"></omgdi:waypoint>
-                <omgdi:waypoint x="285.0" y="315.0"></omgdi:waypoint>
+                <omgdi:waypoint x="505.0" y="360.0"></omgdi:waypoint>
+                <omgdi:waypoint x="505.0" y="315.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-31F41F5A-DC38-48A4-AB39-6CCAC30C2B39" id="BPMNEdge_sid-31F41F5A-DC38-48A4-AB39-6CCAC30C2B39">
-                <omgdi:waypoint x="1345.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1390.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1565.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1610.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-E20D16A1-7AC4-40EF-BAA3-FC171BF0F8D3" id="BPMNEdge_sid-E20D16A1-7AC4-40EF-BAA3-FC171BF0F8D3">
-                <omgdi:waypoint x="1180.5" y="314.5"></omgdi:waypoint>
-                <omgdi:waypoint x="1180.5" y="400.0"></omgdi:waypoint>
-                <omgdi:waypoint x="335.0" y="400.0"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-3A36FF73-424D-4C84-9519-826C52CC9091" id="BPMNEdge_sid-3A36FF73-424D-4C84-9519-826C52CC9091">
-                <omgdi:waypoint x="1490.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1540.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1400.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1400.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="555.0" y="400.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-67A5C40B-EF7D-42AC-8543-BC1E0CB1BDE2" id="BPMNEdge_sid-67A5C40B-EF7D-42AC-8543-BC1E0CB1BDE2">
-                <omgdi:waypoint x="304.5798319327731" y="295.4201680672269"></omgdi:waypoint>
-                <omgdi:waypoint x="355.0" y="295.20920502092054"></omgdi:waypoint>
+                <omgdi:waypoint x="524.5798319327731" y="295.4201680672269"></omgdi:waypoint>
+                <omgdi:waypoint x="575.0" y="295.20920502092054"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-3A36FF73-424D-4C84-9519-826C52CC9091" id="BPMNEdge_sid-3A36FF73-424D-4C84-9519-826C52CC9091">
+                <omgdi:waypoint x="1794.6317871464182" y="295.3682128535819"></omgdi:waypoint>
+                <omgdi:waypoint x="1840.0001918315152" y="295.0556977422003"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2A034CD8-BB86-4783-97D9-DBAE8D4A7199" id="BPMNEdge_sid-2A034CD8-BB86-4783-97D9-DBAE8D4A7199">
-                <omgdi:waypoint x="85.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="120.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="305.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="340.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
-                <omgdi:waypoint x="664.5913461538462" y="295.40865384615387"></omgdi:waypoint>
-                <omgdi:waypoint x="700.0" y="295.2392344497608"></omgdi:waypoint>
+                <omgdi:waypoint x="884.5913461538462" y="295.40865384615387"></omgdi:waypoint>
+                <omgdi:waypoint x="920.0" y="295.2392344497608"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-AA46B27B-7C3C-4586-BB9D-28AC48B16F5E" id="BPMNEdge_sid-AA46B27B-7C3C-4586-BB9D-28AC48B16F5E">
-                <omgdi:waypoint x="645.5" y="314.5"></omgdi:waypoint>
-                <omgdi:waypoint x="645.5" y="400.0"></omgdi:waypoint>
-                <omgdi:waypoint x="335.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="865.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="865.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="555.0" y="400.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" id="BPMNEdge_sid-22C499F4-7179-4558-BC4C-77EF7453FA56">
-                <omgdi:waypoint x="995.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1030.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1215.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1250.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-8E11FCEE-5E6E-4C47-84E1-448933CB3E94" id="BPMNEdge_sid-8E11FCEE-5E6E-4C47-84E1-448933CB3E94">
-                <omgdi:waypoint x="840.3601284054752" y="314.6398715945249"></omgdi:waypoint>
-                <omgdi:waypoint x="839.736328125" y="400.0"></omgdi:waypoint>
-                <omgdi:waypoint x="335.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1060.360128405475" y="314.6398715945249"></omgdi:waypoint>
+                <omgdi:waypoint x="1059.736328125" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="555.0" y="400.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
-                <omgdi:waypoint x="859.5913461538462" y="295.40865384615387"></omgdi:waypoint>
-                <omgdi:waypoint x="895.0" y="295.2392344497608"></omgdi:waypoint>
+                <omgdi:waypoint x="1079.5913461538462" y="295.40865384615387"></omgdi:waypoint>
+                <omgdi:waypoint x="1115.0" y="295.2392344497608"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-DE214B02-7077-42D9-99ED-6263C21BBBDE" id="BPMNEdge_sid-DE214B02-7077-42D9-99ED-6263C21BBBDE">
-                <omgdi:waypoint x="1180.5" y="275.5"></omgdi:waypoint>
-                <omgdi:waypoint x="1180.5" y="222.0162811279297"></omgdi:waypoint>
-                <omgdi:waypoint x="1440.0" y="222.0162811279297"></omgdi:waypoint>
-                <omgdi:waypoint x="1440.0" y="255.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1400.5" y="275.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1400.5" y="222.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="1660.0" y="222.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="1660.0" y="255.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D5B0EDC0-E1F6-4DF3-8769-47C8468EFED2" id="BPMNEdge_sid-D5B0EDC0-E1F6-4DF3-8769-47C8468EFED2">
-                <omgdi:waypoint x="220.0" y="295.2164502164502"></omgdi:waypoint>
-                <omgdi:waypoint x="265.4130434782609" y="295.4130434782609"></omgdi:waypoint>
+                <omgdi:waypoint x="440.0" y="295.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="485.4130434782609" y="295.4130434782609"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
-                <omgdi:waypoint x="799.9999999999999" y="295.00000000000006"></omgdi:waypoint>
-                <omgdi:waypoint x="819.9999999999999" y="295.0000000000001"></omgdi:waypoint>
+                <omgdi:waypoint x="1020.0" y="295.00000000000006"></omgdi:waypoint>
+                <omgdi:waypoint x="1040.0" y="295.0000000000001"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-5DF00195-C2A6-4F61-A585-A29C83728B82" id="BPMNEdge_sid-5DF00195-C2A6-4F61-A585-A29C83728B82">
-                <omgdi:waypoint x="285.5" y="275.5"></omgdi:waypoint>
-                <omgdi:waypoint x="285.5" y="230.0162811279297"></omgdi:waypoint>
-                <omgdi:waypoint x="540.0" y="230.0162811279297"></omgdi:waypoint>
-                <omgdi:waypoint x="540.0" y="255.00000000000003"></omgdi:waypoint>
+                <omgdi:waypoint x="505.5" y="275.5"></omgdi:waypoint>
+                <omgdi:waypoint x="505.5" y="230.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="760.0" y="230.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="760.0" y="255.00000000000003"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-74A32C66-1FC4-44F8-BF30-DD3802882E87" id="BPMNEdge_sid-74A32C66-1FC4-44F8-BF30-DD3802882E87">
+                <omgdi:waypoint x="1710.0" y="295.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="1755.4130434782608" y="295.4130434782609"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-1FB3F13D-0A2A-42A9-8B84-8EEE11D92C5C" id="BPMNEdge_sid-1FB3F13D-0A2A-42A9-8B84-8EEE11D92C5C">
+                <omgdi:waypoint x="1775.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1775.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="555.0" y="400.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D6D3EE5B-D83D-4D08-A781-CCCEB6AF9412" id="BPMNEdge_sid-D6D3EE5B-D83D-4D08-A781-CCCEB6AF9412">
-                <omgdi:waypoint x="455.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="490.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="675.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="710.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-F5F08BDE-2393-4D89-85D3-C40C6199CF5B" id="BPMNEdge_sid-F5F08BDE-2393-4D89-85D3-C40C6199CF5B">
-                <omgdi:waypoint x="1199.5833333333333" y="295.4166666666667"></omgdi:waypoint>
-                <omgdi:waypoint x="1245.0" y="295.2183406113537"></omgdi:waypoint>
+                <omgdi:waypoint x="1419.5833333333333" y="295.4166666666667"></omgdi:waypoint>
+                <omgdi:waypoint x="1465.0" y="295.2183406113537"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
         </bpmndi:BPMNPlane>
     </bpmndi:BPMNDiagram>