市场管理：增项申请业务处室审批后用户交费前，新增企管法规处审批环节(侯处讲该担责的要担责)

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

@@ -0,0 +1,47 @@
+package com.common.workflow.service.activiti.supplierAppendListener;
+
+import com.common.workflow.service.client.FeignClient;
+import com.common.workflow.service.dto.ApproveInfoDTO;
+import com.common.workflow.service.dto.ApproveParamsDTO;
+import feign.Feign;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+
+@Component("AppendLawOfficeAuditService")
+public class AppendLawOfficeAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendLawOfficeAuditService.class);
+    // 企业法规处缴费前审核, 非入库
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        String callbackUrl = delegateTask.getVariable("callbackUrl").toString();
+        String businessKey = delegateTask.getVariable("businessKey").toString();
+        ApproveParamsDTO approveParams = new ApproveParamsDTO();
+        approveParams.setBusinessKey(businessKey);
+        ApproveInfoDTO approveInfo = null;
+        String approveInfoJson = "";
+        if (callbackUrl.length() > 0) {
+            FeignClient client = Feign.builder()
+                .decoder(new JacksonDecoder())
+                .encoder(new JacksonEncoder())
+                .target(FeignClient.class, callbackUrl);
+            approveInfo = client.getAppendLawOfficeAuditors(approveParams);
+        } else {
+            throw new ActivitiException("无回调地址，请联系管理员！");
+        }
+        if (approveInfo.getUsers().length() <= 0) {
+            throw new ActivitiException("未找到审核用户，请联系管理员！");
+        }
+        logger.info("增项工作流业务ID:" + businessKey + " 获取企业法规处审核审核人: " + approveInfo.getUsers());
+        delegateTask.setVariable("users", approveInfo.getUsers());
+        delegateTask.setVariableLocal("users", approveInfo.getUsers());
+        delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));
+    }
+}

src/main/java/com/common/workflow/service/client/FeignClient.java

@@ -47,6 +47,10 @@ public interface FeignClient {
     @RequestLine("POST /suppliercert-append-listener/pre-third-trail")
     ApproveInfoDTO getAppendPreThirdTrail(@RequestBody ApproveParamsDTO approveParamsDTO);
 
+    @Headers({"Content-Type: application/json","Accept: application/json"})
+    @RequestLine("POST /suppliercert-append-listener/law-office-auditors")
+    ApproveInfoDTO getAppendLawOfficeAuditors(@RequestBody ApproveParamsDTO approveParamsDTO);
+
     @Headers({"Content-Type: application/json","Accept: application/json"})
     @RequestLine("POST /suppliercert-append-listener/pre-storage-audit")
     ApproveInfoDTO getAppendPreStorageAuditors(@RequestBody ApproveParamsDTO approveParamsDTO);

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

@@ -53,11 +53,6 @@
         <sequenceFlow id="sid-5DF00195-C2A6-4F61-A585-A29C83728B82" name="二级单位申请" sourceRef="sid-ACC9707A-EFE4-4980-988B-5F87083CE851" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-BE646B05-EF10-4029-BC3B-BCABCFF884B1" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B">
-            <extensionElements>
-                <activiti:executionListener event="start" delegateExpression="${appendCheckNeedPayService}"></activiti:executionListener>
-            </extensionElements>
-        </sequenceFlow>
         <sequenceFlow id="sid-31F41F5A-DC38-48A4-AB39-6CCAC30C2B39" sourceRef="sid-7D1F719F-8AF4-449E-BD5E-767BCFDA0B77" targetRef="sid-3EA02700-4143-4282-A6C2-08CE0F38E76C"></sequenceFlow>
         <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
         <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
@@ -67,12 +62,6 @@
         <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>
@@ -97,16 +86,6 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-1FB3F13D-0A2A-42A9-8B84-8EEE11D92C5C" sourceRef="sid-5FCFE3C4-8813-4238-8117-05B14EB95C66" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
-            <extensionElements>
-                <activiti:executionListener event="start" delegateExpression="${appendApprovalRefuseService}">
-                    <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-7]]></activiti:string>
-                    </activiti:field>
-                </activiti:executionListener>
-            </extensionElements>
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-        </sequenceFlow>
         <exclusiveGateway id="sid-36DC6E30-FACE-41C2-BBAA-E7F281771043"></exclusiveGateway>
         <sequenceFlow id="sid-0A52E255-1A50-4E8C-B374-9421D6E04D76" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-36DC6E30-FACE-41C2-BBAA-E7F281771043"></sequenceFlow>
         <sequenceFlow id="sid-AE739CF6-1E52-4771-ACA4-8B0AA6192002" name="通过" sourceRef="sid-36DC6E30-FACE-41C2-BBAA-E7F281771043" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
@@ -133,33 +112,74 @@
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
         <exclusiveGateway id="sid-73C82021-679A-4A47-9AF2-45061DC7AED6"></exclusiveGateway>
+        <sequenceFlow id="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <exclusiveGateway id="sid-E47879E9-C85C-41A3-A0D9-77DCE00FE3F1"></exclusiveGateway>
+        <userTask id="sid-D2D17D80-55CE-4540-8E57-018B8111FC66" name="企管法规处审批" activiti:candidateUsers="${users}">
+            <extensionElements>
+                <activiti:taskListener event="create" delegateExpression="${AppendLawOfficeAuditService}"></activiti:taskListener>
+            </extensionElements>
+        </userTask>
         <sequenceFlow id="sid-39001E8D-7208-4665-A526-1B732527D78F" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-73C82021-679A-4A47-9AF2-45061DC7AED6"></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-E3C916E1-A5A4-4923-A44F-4900CD32425E" name="通过" sourceRef="sid-73C82021-679A-4A47-9AF2-45061DC7AED6" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-C6DF2A40-F49C-4D4A-83FB-3D3AE537C640" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-E47879E9-C85C-41A3-A0D9-77DCE00FE3F1"></sequenceFlow>
+        <sequenceFlow id="sid-470B68DC-C977-4A10-809B-6D1736C78F65" name="不通过" sourceRef="sid-73C82021-679A-4A47-9AF2-45061DC7AED6" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
+            <extensionElements>
+                <activiti:executionListener event="end" delegateExpression="${appendApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-3]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-1FB3F13D-0A2A-42A9-8B84-8EEE11D92C5C" sourceRef="sid-5FCFE3C4-8813-4238-8117-05B14EB95C66" 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[-7]]></activiti:string>
                     </activiti:field>
                 </activiti:executionListener>
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-470B68DC-C977-4A10-809B-6D1736C78F65" name="不通过" sourceRef="sid-73C82021-679A-4A47-9AF2-45061DC7AED6" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
+        <sequenceFlow id="sid-0022E95C-C22F-489A-8D7F-168D758C861C" name="不通过" sourceRef="sid-E47879E9-C85C-41A3-A0D9-77DCE00FE3F1" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
             <extensionElements>
                 <activiti:executionListener event="end" delegateExpression="${appendApprovalRefuseService}">
                     <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-3]]></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-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
+        <sequenceFlow id="sid-4075DE35-9890-48A6-A54E-5EAE57F8CD3F" sourceRef="sid-E47879E9-C85C-41A3-A0D9-77DCE00FE3F1" targetRef="sid-D2D17D80-55CE-4540-8E57-018B8111FC66">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-E3C916E1-A5A4-4923-A44F-4900CD32425E" name="通过" sourceRef="sid-73C82021-679A-4A47-9AF2-45061DC7AED6" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+        <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-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[-9]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></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>
+        <sequenceFlow id="sid-3E712FD3-F39A-468F-9C5E-42B995DE2D3A" sourceRef="sid-D2D17D80-55CE-4540-8E57-018B8111FC66" targetRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${appendCheckNeedPayService}"></activiti:executionListener>
+            </extensionElements>
+        </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_enuser_append_apply">
         <bpmndi:BPMNPlane bpmnElement="oil_enuser_append_apply" id="BPMNPlane_oil_enuser_append_apply">
@@ -185,7 +205,7 @@
                 <omgdc:Bounds height="40.0" width="40.0" x="745.0" y="95.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="1835.0" y="101.0"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="2075.0" y="101.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="1015.0" y="75.0"></omgdc:Bounds>
@@ -194,13 +214,13 @@
                 <omgdc:Bounds height="80.0" width="100.0" x="140.0" y="75.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="1375.0" y="95.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1615.0" y="95.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="1460.0" y="75.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1700.0" y="75.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="1605.0" y="75.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1845.0" y="75.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="285.0" y="95.0"></omgdc:Bounds>
@@ -209,7 +229,7 @@
                 <omgdc:Bounds height="80.0" width="100.0" x="255.0" y="180.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="1750.0" y="95.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1990.0" y="95.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-36DC6E30-FACE-41C2-BBAA-E7F281771043" id="BPMNShape_sid-36DC6E30-FACE-41C2-BBAA-E7F281771043">
                 <omgdc:Bounds height="40.0" width="40.0" x="520.0" y="95.0"></omgdc:Bounds>
@@ -217,9 +237,15 @@
             <bpmndi:BPMNShape bpmnElement="sid-73C82021-679A-4A47-9AF2-45061DC7AED6" id="BPMNShape_sid-73C82021-679A-4A47-9AF2-45061DC7AED6">
                 <omgdc:Bounds height="40.0" width="40.0" x="1160.0" y="95.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="1345.0" y="115.00000000000001"></omgdi:waypoint>
-                <omgdi:waypoint x="1375.0" y="115.0"></omgdi:waypoint>
+            <bpmndi:BPMNShape bpmnElement="sid-E47879E9-C85C-41A3-A0D9-77DCE00FE3F1" id="BPMNShape_sid-E47879E9-C85C-41A3-A0D9-77DCE00FE3F1">
+                <omgdc:Bounds height="40.0" width="40.0" x="1390.0" y="95.00000000000003"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-D2D17D80-55CE-4540-8E57-018B8111FC66" id="BPMNShape_sid-D2D17D80-55CE-4540-8E57-018B8111FC66">
+                <omgdc:Bounds height="80.0" width="100.0" x="1475.0" y="75.00000000000003"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNEdge bpmnElement="sid-4075DE35-9890-48A6-A54E-5EAE57F8CD3F" id="BPMNEdge_sid-4075DE35-9890-48A6-A54E-5EAE57F8CD3F">
+                <omgdi:waypoint x="1429.5833333333333" y="115.4166666666667"></omgdi:waypoint>
+                <omgdi:waypoint x="1475.0" y="115.21834061135374"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
                 <omgdi:waypoint x="710.0" y="115.0"></omgdi:waypoint>
@@ -234,8 +260,8 @@
                 <omgdi:waypoint x="375.0" y="115.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="1790.0" y="115.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1835.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2030.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2075.0" y="115.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-39001E8D-7208-4665-A526-1B732527D78F" id="BPMNEdge_sid-39001E8D-7208-4665-A526-1B732527D78F">
                 <omgdi:waypoint x="1115.0" y="115.0"></omgdi:waypoint>
@@ -245,6 +271,10 @@
                 <omgdi:waypoint x="105.0" y="115.0"></omgdi:waypoint>
                 <omgdi:waypoint x="140.0" y="115.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-C6DF2A40-F49C-4D4A-83FB-3D3AE537C640" id="BPMNEdge_sid-C6DF2A40-F49C-4D4A-83FB-3D3AE537C640">
+                <omgdi:waypoint x="1345.0" y="115.21645021645024"></omgdi:waypoint>
+                <omgdi:waypoint x="1390.4130434782608" y="115.4130434782609"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-AA46B27B-7C3C-4586-BB9D-28AC48B16F5E" id="BPMNEdge_sid-AA46B27B-7C3C-4586-BB9D-28AC48B16F5E">
                 <omgdi:waypoint x="765.0" y="135.0"></omgdi:waypoint>
                 <omgdi:waypoint x="765.0" y="220.0"></omgdi:waypoint>
@@ -259,16 +289,16 @@
                 <omgdi:waypoint x="960.0" y="220.0"></omgdi:waypoint>
                 <omgdi:waypoint x="355.0" y="220.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-DE214B02-7077-42D9-99ED-6263C21BBBDE" id="BPMNEdge_sid-DE214B02-7077-42D9-99ED-6263C21BBBDE">
-                <omgdi:waypoint x="1395.0" y="95.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1395.0" y="42.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1655.0" y="42.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1655.0" y="75.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="980.0" y="115.0"></omgdi:waypoint>
                 <omgdi:waypoint x="1015.0" y="115.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-DE214B02-7077-42D9-99ED-6263C21BBBDE" id="BPMNEdge_sid-DE214B02-7077-42D9-99ED-6263C21BBBDE">
+                <omgdi:waypoint x="1635.0" y="95.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1635.0" y="42.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1895.0" y="42.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1895.0" y="75.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="240.0" y="115.0"></omgdi:waypoint>
                 <omgdi:waypoint x="285.0" y="115.0"></omgdi:waypoint>
@@ -280,25 +310,29 @@
                 <omgdi:waypoint x="660.0" y="75.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="1705.0" y="115.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1750.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1945.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1990.0" y="115.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="1415.0" y="115.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1460.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1655.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1700.0" y="115.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-470B68DC-C977-4A10-809B-6D1736C78F65" id="BPMNEdge_sid-470B68DC-C977-4A10-809B-6D1736C78F65">
                 <omgdi:waypoint x="1180.0" y="135.0"></omgdi:waypoint>
                 <omgdi:waypoint x="1180.0" y="220.0"></omgdi:waypoint>
                 <omgdi:waypoint x="355.0" y="220.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-3E712FD3-F39A-468F-9C5E-42B995DE2D3A" id="BPMNEdge_sid-3E712FD3-F39A-468F-9C5E-42B995DE2D3A">
+                <omgdi:waypoint x="1575.0" y="115.00000000000001"></omgdi:waypoint>
+                <omgdi:waypoint x="1615.0" y="115.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="305.0" y="180.0"></omgdi:waypoint>
                 <omgdi:waypoint x="305.0" y="135.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="1560.0" y="115.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1605.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1800.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1845.0" y="115.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D928C4F4-1CC5-4B2E-B9C4-6135ADAC4517" id="BPMNEdge_sid-D928C4F4-1CC5-4B2E-B9C4-6135ADAC4517">
                 <omgdi:waypoint x="540.0" y="135.0"></omgdi:waypoint>
@@ -306,8 +340,13 @@
                 <omgdi:waypoint x="355.0" y="220.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="1395.0" y="135.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1395.0" y="220.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1635.0" y="135.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1635.0" y="220.0"></omgdi:waypoint>
+                <omgdi:waypoint x="355.0" y="220.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-0022E95C-C22F-489A-8D7F-168D758C861C" id="BPMNEdge_sid-0022E95C-C22F-489A-8D7F-168D758C861C">
+                <omgdi:waypoint x="1410.5" y="134.50000000000003"></omgdi:waypoint>
+                <omgdi:waypoint x="1410.5" y="220.0"></omgdi:waypoint>
                 <omgdi:waypoint x="355.0" y="220.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
@@ -323,8 +362,8 @@
                 <omgdi:waypoint x="940.0" y="115.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-1FB3F13D-0A2A-42A9-8B84-8EEE11D92C5C" id="BPMNEdge_sid-1FB3F13D-0A2A-42A9-8B84-8EEE11D92C5C">
-                <omgdi:waypoint x="1770.0" y="135.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1770.0" y="220.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2010.0" y="135.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2010.0" y="220.0"></omgdi:waypoint>
                 <omgdi:waypoint x="355.0" y="220.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
         </bpmndi:BPMNPlane>