市场管理：准入申请在专业处室审核后增加企管法规处审核环节；准入在流程到交费环节后允许申请用户撤回该申请。

src/main/java/com/common/workflow/service/activiti/supplierListener/PreProfRegAuditService.java

@@ -0,0 +1,48 @@
+package com.common.workflow.service.activiti.supplierListener;
+
+import com.common.workflow.service.client.FeignClient;
+import com.common.workflow.service.dto.ApproveInfoDTO;
+import com.common.workflow.service.dto.ApproveParamsDTO;
+import com.common.workflow.service.util.HttpRequest;
+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("preProfRegAuditService")
+public class PreProfRegAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PreProfRegAuditService.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.getPreProfRegAuditors(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

@@ -28,6 +28,10 @@ public interface FeignClient {
     @RequestLine("POST /suppliercert-listener/pre-concentrate-audit")
     ApproveInfoDTO getPreConcentrateAuditors(@RequestBody ApproveParamsDTO approveParamsDTO);
 
+    @Headers({"Content-Type: application/json","Accept: application/json"})
+    @RequestLine("POST /suppliercert-listener/pre-prof-reg-audit")
+    ApproveInfoDTO getPreProfRegAuditors(@RequestBody ApproveParamsDTO approveParamsDTO);
+
     @Headers({"Content-Type: application/json","Accept: application/json"})
     @RequestLine("POST /suppliercert-listener/pre-storage-audit")
     ApproveInfoDTO getPreStorageAuditors(@RequestBody ApproveParamsDTO approveParamsDTO);

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

@@ -53,7 +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-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">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
@@ -146,6 +145,25 @@
             </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>
+        <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>
+        <exclusiveGateway id="sid-D5CFA3D4-55BD-485F-B286-B6DA4B25B1C5"></exclusiveGateway>
+        <sequenceFlow id="sid-EF5AE0D3-3ECA-499C-B7E5-808BE5B1FC1A" sourceRef="sid-7D1F719F-8AF4-449E-BD5E-767BCFDA0B77" targetRef="sid-D5CFA3D4-55BD-485F-B286-B6DA4B25B1C5"></sequenceFlow>
+        <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-AF5ECBCC-BA4A-4DAF-99F2-C135D7A0F1DD" sourceRef="sid-D5CFA3D4-55BD-485F-B286-B6DA4B25B1C5" targetRef="sid-3EA02700-4143-4282-A6C2-08CE0F38E76C">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
         <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}">
@@ -156,12 +174,6 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <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-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}">
@@ -172,13 +184,15 @@
             </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">
+        <sequenceFlow id="sid-55DF85DC-E0AD-4553-B69B-69464902760F" sourceRef="sid-D5CFA3D4-55BD-485F-B286-B6DA4B25B1C5" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
             <extensionElements>
-                <activiti:executionListener event="start" delegateExpression="${appendCheckNeedPayService}"></activiti:executionListener>
+                <activiti:executionListener event="end" delegateExpression="${appendApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-6]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
             </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_enuser_append_apply">
@@ -205,7 +219,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="2075.0" y="101.0"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="2155.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>
@@ -220,7 +234,7 @@
                 <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="1845.0" y="75.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1925.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>
@@ -229,7 +243,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="1990.0" y="95.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="2070.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>
@@ -243,6 +257,9 @@
             <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:BPMNShape bpmnElement="sid-D5CFA3D4-55BD-485F-B286-B6DA4B25B1C5" id="BPMNShape_sid-D5CFA3D4-55BD-485F-B286-B6DA4B25B1C5">
+                <omgdc:Bounds height="40.0" width="40.0" x="1845.0" y="95.0"></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>
@@ -260,8 +277,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="2030.0" y="115.0"></omgdi:waypoint>
-                <omgdi:waypoint x="2075.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2110.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2155.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>
@@ -296,13 +313,17 @@
             <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>
+                <omgdi:waypoint x="1975.0" y="42.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1975.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>
             </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-AF5ECBCC-BA4A-4DAF-99F2-C135D7A0F1DD" id="BPMNEdge_sid-AF5ECBCC-BA4A-4DAF-99F2-C135D7A0F1DD">
+                <omgdi:waypoint x="1884.5871559633028" y="115.41284403669725"></omgdi:waypoint>
+                <omgdi:waypoint x="1925.0" y="115.22831050228311"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-5DF00195-C2A6-4F61-A585-A29C83728B82" id="BPMNEdge_sid-5DF00195-C2A6-4F61-A585-A29C83728B82">
                 <omgdi:waypoint x="305.0" y="95.0"></omgdi:waypoint>
                 <omgdi:waypoint x="305.0" y="50.0"></omgdi:waypoint>
@@ -310,8 +331,8 @@
                 <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="1945.0" y="115.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1990.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2025.0" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2070.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="1655.0" y="115.0"></omgdi:waypoint>
@@ -326,13 +347,18 @@
                 <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-55DF85DC-E0AD-4553-B69B-69464902760F" id="BPMNEdge_sid-55DF85DC-E0AD-4553-B69B-69464902760F">
+                <omgdi:waypoint x="1865.5" y="134.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1865.5" y="220.0"></omgdi:waypoint>
+                <omgdi:waypoint x="355.0" y="220.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="1800.0" y="115.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1845.0" y="115.0"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-EF5AE0D3-3ECA-499C-B7E5-808BE5B1FC1A" id="BPMNEdge_sid-EF5AE0D3-3ECA-499C-B7E5-808BE5B1FC1A">
+                <omgdi:waypoint x="1800.0" y="115.21645021645021"></omgdi:waypoint>
+                <omgdi:waypoint x="1845.4130434782608" y="115.41304347826087"></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>
@@ -362,8 +388,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="2010.0" y="135.0"></omgdi:waypoint>
-                <omgdi:waypoint x="2010.0" y="220.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2090.0" y="135.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2090.0" y="220.0"></omgdi:waypoint>
                 <omgdi:waypoint x="355.0" y="220.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
         </bpmndi:BPMNPlane>

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

@@ -57,24 +57,15 @@
                 <activiti:taskListener event="create" delegateExpression="${preStorageAuditService}"></activiti:taskListener>
             </extensionElements>
         </userTask>
-        <sequenceFlow id="sid-22A32961-337F-4185-8E96-CF46812C6A5A" sourceRef="sid-7D60C5CA-F630-4C5D-A20F-2DE15307AA6D" targetRef="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600"></sequenceFlow>
         <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
         <sequenceFlow id="sid-1C4E0AB0-14F9-4EC5-8D09-DB98FAF51BE6" name="企业用户申请" sourceRef="sid-643A5BA6-748C-4D18-96A0-EE1D2C03DEFE" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-16929529-744D-4509-923E-820FA2E3AEE3" name="通过并缴费" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-7D60C5CA-F630-4C5D-A20F-2DE15307AA6D">
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-        </sequenceFlow>
         <sequenceFlow id="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" sourceRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" targetRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895">
             <extensionElements>
                 <activiti:executionListener event="end" delegateExpression="${checkNeedPayService}"></activiti:executionListener>
             </extensionElements>
         </sequenceFlow>
-        <sequenceFlow id="sid-89ED731E-278D-4033-8445-73676D8B5F0A" name="审批" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
-            <extensionElements>
-                <activiti:executionListener event="start" delegateExpression="${checkNeedConcentrateAuditService}"></activiti:executionListener>
-            </extensionElements>
-        </sequenceFlow>
         <sequenceFlow id="sid-D6C377D7-98CC-4D68-B577-22E60AD1578A" name="不集中评审" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895">
             <extensionElements>
                 <activiti:executionListener event="end" delegateExpression="${checkNeedPayService}"></activiti:executionListener>
@@ -104,16 +95,6 @@
         <sequenceFlow id="sid-45DED472-AC98-4ED3-B1EE-3EE6305F1413" name="二级单位申请" sourceRef="sid-643A5BA6-748C-4D18-96A0-EE1D2C03DEFE" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" name="不通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
-            <extensionElements>
-                <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
-                    <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-D683E891-1671-40A6-9103-C03866D0640B" name="通过不缴费" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
         </sequenceFlow>
@@ -164,7 +145,34 @@
         </sequenceFlow>
         <exclusiveGateway id="sid-866B1430-43CC-46D8-A4AD-94027431B377"></exclusiveGateway>
         <sequenceFlow id="sid-2ED3E036-000C-46C5-BDEA-58A0F3D17270" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-866B1430-43CC-46D8-A4AD-94027431B377"></sequenceFlow>
+        <sequenceFlow id="sid-4EC3F6CF-0309-4E6F-9401-408F9A514202" name="不通过" sourceRef="sid-866B1430-43CC-46D8-A4AD-94027431B377" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+            <extensionElements>
+                <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-3]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
+        <userTask id="sid-8338E4AD-A6DB-4D1C-B334-54353648C4B0" name="企管法规处审核" activiti:candidateUsers="${users}">
+            <extensionElements>
+                <activiti:taskListener event="create" delegateExpression="${preProfRegAuditService}"></activiti:taskListener>
+            </extensionElements>
+        </userTask>
+        <exclusiveGateway id="sid-3DEC5B7A-6CAC-4B24-A623-728E56B78AEF"></exclusiveGateway>
         <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+            <extensionElements>
+                <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
+                    <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-7C585A21-BE10-46EC-B679-7FFA227CC329" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-3DEC5B7A-6CAC-4B24-A623-728E56B78AEF"></sequenceFlow>
+        <sequenceFlow id="sid-16794871-4CEB-4922-9CB9-1D047C314055" name="不通过" sourceRef="sid-3DEC5B7A-6CAC-4B24-A623-728E56B78AEF" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
             <extensionElements>
                 <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
                     <activiti:field name="stepCode">
@@ -174,210 +182,267 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
+        <sequenceFlow id="sid-4077038D-8D64-4AB2-909E-52035389456F" sourceRef="sid-3DEC5B7A-6CAC-4B24-A623-728E56B78AEF" targetRef="sid-8338E4AD-A6DB-4D1C-B334-54353648C4B0">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
         <sequenceFlow id="sid-D7981E44-618F-4877-9E56-B46FB2CE277D" name="通过" sourceRef="sid-866B1430-43CC-46D8-A4AD-94027431B377" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-4EC3F6CF-0309-4E6F-9401-408F9A514202" name="不通过" sourceRef="sid-866B1430-43CC-46D8-A4AD-94027431B377" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+        <exclusiveGateway id="sid-B6D88901-92BC-46FD-8C94-104E7791F960"></exclusiveGateway>
+        <sequenceFlow id="sid-16929529-744D-4509-923E-820FA2E3AEE3" name="通过并缴费" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-7D60C5CA-F630-4C5D-A20F-2DE15307AA6D">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-2C1CFE3F-7499-4D09-8CCF-F3B478BD034F" sourceRef="sid-B6D88901-92BC-46FD-8C94-104E7791F960" targetRef="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" name="不通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
             <extensionElements>
                 <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
                     <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-3]]></activiti:string>
+                        <activiti:string><![CDATA[-5]]></activiti:string>
                     </activiti:field>
                 </activiti:executionListener>
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
+        <sequenceFlow id="sid-637038EC-94DC-4E86-8DFC-D0FE2A45FB07" sourceRef="sid-7D60C5CA-F630-4C5D-A20F-2DE15307AA6D" targetRef="sid-B6D88901-92BC-46FD-8C94-104E7791F960"></sequenceFlow>
+        <sequenceFlow id="sid-6670F3C2-E150-46E6-96CF-F5BBD667E7EF" name="撤回" sourceRef="sid-B6D88901-92BC-46FD-8C94-104E7791F960" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+            <extensionElements>
+                <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-6]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-DFEE94DC-E1AE-4D57-8A48-0DF304FDDF15" sourceRef="sid-8338E4AD-A6DB-4D1C-B334-54353648C4B0" targetRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${checkNeedConcentrateAuditService}"></activiti:executionListener>
+            </extensionElements>
+        </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_enuser_supplier_apply">
         <bpmndi:BPMNPlane bpmnElement="oil_enuser_supplier_apply" id="BPMNPlane_oil_enuser_supplier_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="70.0" y="88.0"></omgdc:Bounds>
+                <omgdc:Bounds height="30.0" width="30.0" x="30.0" y="88.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="385.0" y="63.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="345.0" y="63.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="1266.0" y="63.999997350905176"></omgdc:Bounds>
+                <omgdc:Bounds height="79.99999999999994" width="100.0" x="1226.0" y="63.999997350905176"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" id="BPMNShape_sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
-                <omgdc:Bounds height="40.0" width="40.0" x="1401.0" y="83.99999735090472"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1601.0" y="83.99999735090472"></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="100.0" x="815.0" y="63.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="775.0" y="63.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="956.0" y="83.99999735090472"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="916.0" y="83.99999735090472"></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.99999999999994" width="100.0" x="620.0" y="63.0"></omgdc:Bounds>
+                <omgdc:Bounds height="79.99999999999994" width="100.0" x="580.0" y="63.0"></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="750.0" y="83.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="710.0" y="83.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" id="BPMNShape_sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3">
-                <omgdc:Bounds height="80.0" width="100.00000000000023" x="1476.0" y="63.99999735090472"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.00000000000023" x="1676.0" y="63.99999735090472"></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="2196.0" y="90.0"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="2416.0" y="90.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="1031.0" y="63.99999735090523"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="991.0" y="63.99999735090523"></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="130.0" y="63.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="90.0" y="63.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-643A5BA6-748C-4D18-96A0-EE1D2C03DEFE" id="BPMNShape_sid-643A5BA6-748C-4D18-96A0-EE1D2C03DEFE">
-                <omgdc:Bounds height="40.0" width="40.0" x="285.0" y="83.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="245.0" y="83.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-7D60C5CA-F630-4C5D-A20F-2DE15307AA6D" id="BPMNShape_sid-7D60C5CA-F630-4C5D-A20F-2DE15307AA6D">
-                <omgdc:Bounds height="80.0" width="100.0" x="1731.0" y="64.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1931.0" y="64.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600" id="BPMNShape_sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600">
-                <omgdc:Bounds height="79.0" width="133.0526315789475" x="1875.9473684210525" y="64.49999735090472"></omgdc:Bounds>
+                <omgdc:Bounds height="79.0" width="133.0526315789475" x="2155.9473684210525" y="64.49999735090472"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" id="BPMNShape_sid-025875DE-EAC2-4FBC-B4A4-91377D669895">
-                <omgdc:Bounds height="40.0" width="40.0" x="1611.0" y="83.99999735090523"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1811.0" y="83.99999735090523"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1" id="BPMNShape_sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
-                <omgdc:Bounds height="80.0" width="100.0" x="255.0" y="168.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="215.0" y="168.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-73F4C8B5-B562-4109-821B-377B94E5D84C" id="BPMNShape_sid-73F4C8B5-B562-4109-821B-377B94E5D84C">
-                <omgdc:Bounds height="40.0" width="40.0" x="2054.0" y="83.99999735090472"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="2334.0" y="83.99999735090472"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-5A29A6AC-9AF4-444E-A458-C3C3E075998C" id="BPMNShape_sid-5A29A6AC-9AF4-444E-A458-C3C3E075998C">
-                <omgdc:Bounds height="40.0" width="40.0" x="530.0" y="83.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="490.0" y="83.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-866B1430-43CC-46D8-A4AD-94027431B377" id="BPMNShape_sid-866B1430-43CC-46D8-A4AD-94027431B377">
-                <omgdc:Bounds height="40.0" width="40.0" x="1176.0" y="83.99999735090523"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1136.0" y="83.99999735090523"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-8338E4AD-A6DB-4D1C-B334-54353648C4B0" id="BPMNShape_sid-8338E4AD-A6DB-4D1C-B334-54353648C4B0">
+                <omgdc:Bounds height="80.0" width="100.0" x="1451.0" y="63.99999735090515"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-3DEC5B7A-6CAC-4B24-A623-728E56B78AEF" id="BPMNShape_sid-3DEC5B7A-6CAC-4B24-A623-728E56B78AEF">
+                <omgdc:Bounds height="40.0" width="40.0" x="1371.0" y="83.99999735090515"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-B6D88901-92BC-46FD-8C94-104E7791F960" id="BPMNShape_sid-B6D88901-92BC-46FD-8C94-104E7791F960">
+                <omgdc:Bounds height="40.0" width="40.0" x="2076.0" y="84.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
-            <bpmndi:BPMNEdge bpmnElement="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" id="BPMNEdge_sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170">
-                <omgdi:waypoint x="1631.0" y="123.99999735090523"></omgdi:waypoint>
-                <omgdi:waypoint x="1631.0" y="208.0"></omgdi:waypoint>
-                <omgdi:waypoint x="355.0" y="208.0"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" id="BPMNEdge_sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C">
-                <omgdi:waypoint x="1421.0" y="123.99999735090472"></omgdi:waypoint>
-                <omgdi:waypoint x="1421.0" y="208.0"></omgdi:waypoint>
-                <omgdi:waypoint x="355.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1621.0" y="123.99999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="1621.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" id="BPMNEdge_sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170">
+                <omgdi:waypoint x="1831.0" y="123.99999735090523"></omgdi:waypoint>
+                <omgdi:waypoint x="1831.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2318E253-9ABF-4780-BFA6-B4AAB8979338" id="BPMNEdge_sid-2318E253-9ABF-4780-BFA6-B4AAB8979338">
-                <omgdi:waypoint x="570.0" y="103.0"></omgdi:waypoint>
-                <omgdi:waypoint x="620.0" y="102.99999999999999"></omgdi:waypoint>
+                <omgdi:waypoint x="530.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="580.0" y="102.99999999999999"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
-                <omgdi:waypoint x="720.0" y="102.99999999999999"></omgdi:waypoint>
-                <omgdi:waypoint x="750.0" y="103.0"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-16794871-4CEB-4922-9CB9-1D047C314055" id="BPMNEdge_sid-16794871-4CEB-4922-9CB9-1D047C314055">
+                <omgdi:waypoint x="1391.5" y="123.49999735090515"></omgdi:waypoint>
+                <omgdi:waypoint x="1391.5" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-22A32961-337F-4185-8E96-CF46812C6A5A" id="BPMNEdge_sid-22A32961-337F-4185-8E96-CF46812C6A5A">
-                <omgdi:waypoint x="1831.0" y="103.999999179713"></omgdi:waypoint>
-                <omgdi:waypoint x="1875.9473684210525" y="103.99999844231817"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
+                <omgdi:waypoint x="680.0" y="102.99999999999999"></omgdi:waypoint>
+                <omgdi:waypoint x="710.0" y="103.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2ED3E036-000C-46C5-BDEA-58A0F3D17270" id="BPMNEdge_sid-2ED3E036-000C-46C5-BDEA-58A0F3D17270">
-                <omgdi:waypoint x="1131.0" y="103.99999735090523"></omgdi:waypoint>
-                <omgdi:waypoint x="1176.0" y="103.99999735090523"></omgdi:waypoint>
+                <omgdi:waypoint x="1091.0" y="103.99999735090523"></omgdi:waypoint>
+                <omgdi:waypoint x="1136.0" y="103.99999735090523"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-F5AEDECD-FD07-4C0B-85F9-EA3650C05E7D" id="BPMNEdge_sid-F5AEDECD-FD07-4C0B-85F9-EA3650C05E7D">
-                <omgdi:waypoint x="230.0" y="103.0"></omgdi:waypoint>
-                <omgdi:waypoint x="285.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="190.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="245.0" y="103.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-4077038D-8D64-4AB2-909E-52035389456F" id="BPMNEdge_sid-4077038D-8D64-4AB2-909E-52035389456F">
+                <omgdi:waypoint x="1410.5871559633028" y="104.4128413876024"></omgdi:waypoint>
+                <omgdi:waypoint x="1451.0" y="104.22830785318826"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-6670F3C2-E150-46E6-96CF-F5BBD667E7EF" id="BPMNEdge_sid-6670F3C2-E150-46E6-96CF-F5BBD667E7EF">
+                <omgdi:waypoint x="2096.5" y="123.5"></omgdi:waypoint>
+                <omgdi:waypoint x="2096.5" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
-                <omgdi:waypoint x="770.0" y="123.0"></omgdi:waypoint>
-                <omgdi:waypoint x="770.0" y="208.0"></omgdi:waypoint>
-                <omgdi:waypoint x="355.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="730.0" y="123.0"></omgdi:waypoint>
+                <omgdi:waypoint x="730.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.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="996.0000000000001" y="103.9999973509048"></omgdi:waypoint>
-                <omgdi:waypoint x="1031.0" y="103.99999735090499"></omgdi:waypoint>
+                <omgdi:waypoint x="956.0000000000001" y="103.9999973509048"></omgdi:waypoint>
+                <omgdi:waypoint x="991.0" y="103.99999735090499"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
-                <omgdi:waypoint x="1576.0000000000002" y="103.99999735090496"></omgdi:waypoint>
-                <omgdi:waypoint x="1611.0" y="103.99999735090513"></omgdi:waypoint>
+                <omgdi:waypoint x="1776.0000000000002" y="103.99999735090496"></omgdi:waypoint>
+                <omgdi:waypoint x="1811.0" y="103.99999735090513"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-88A209D3-7FCC-4045-97A7-D53AA9760CE8" id="BPMNEdge_sid-88A209D3-7FCC-4045-97A7-D53AA9760CE8">
-                <omgdi:waypoint x="2074.0" y="123.99999735090472"></omgdi:waypoint>
-                <omgdi:waypoint x="2074.0" y="208.0"></omgdi:waypoint>
-                <omgdi:waypoint x="355.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2354.0" y="123.99999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="2354.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-E19E2941-6B2A-4114-B292-5D789BA0959A" id="BPMNEdge_sid-E19E2941-6B2A-4114-B292-5D789BA0959A">
-                <omgdi:waypoint x="1441.0" y="103.99999735090472"></omgdi:waypoint>
-                <omgdi:waypoint x="1476.0" y="103.99999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="1641.0" y="103.99999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="1676.0" y="103.99999735090472"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
-                <omgdi:waypoint x="976.0" y="123.99999735090472"></omgdi:waypoint>
-                <omgdi:waypoint x="976.0" y="208.0"></omgdi:waypoint>
-                <omgdi:waypoint x="355.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="936.0" y="123.99999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="936.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-7C585A21-BE10-46EC-B679-7FFA227CC329" id="BPMNEdge_sid-7C585A21-BE10-46EC-B679-7FFA227CC329">
+                <omgdi:waypoint x="1326.0" y="104.21644756735536"></omgdi:waypoint>
+                <omgdi:waypoint x="1371.4130434782608" y="104.41304082916602"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D7981E44-618F-4877-9E56-B46FB2CE277D" id="BPMNEdge_sid-D7981E44-618F-4877-9E56-B46FB2CE277D">
-                <omgdi:waypoint x="1216.0" y="103.99999735090522"></omgdi:waypoint>
-                <omgdi:waypoint x="1266.0" y="103.99999735090518"></omgdi:waypoint>
+                <omgdi:waypoint x="1176.0" y="103.99999735090522"></omgdi:waypoint>
+                <omgdi:waypoint x="1226.0" y="103.99999735090518"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-4B9FFFB8-8CC6-4D7B-B5BA-1DD0BE92AF50" id="BPMNEdge_sid-4B9FFFB8-8CC6-4D7B-B5BA-1DD0BE92AF50">
-                <omgdi:waypoint x="485.0" y="103.0"></omgdi:waypoint>
-                <omgdi:waypoint x="530.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="445.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="490.0" y="103.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D6C377D7-98CC-4D68-B577-22E60AD1578A" id="BPMNEdge_sid-D6C377D7-98CC-4D68-B577-22E60AD1578A">
-                <omgdi:waypoint x="1421.0" y="83.99999735090472"></omgdi:waypoint>
-                <omgdi:waypoint x="1421.0" y="34.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1567.0" y="34.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1621.447761005188" y="93.55223634571708"></omgdi:waypoint>
+                <omgdi:waypoint x="1621.0" y="83.99999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="1621.0" y="34.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1767.0" y="34.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1821.447761005188" y="93.55223634571708"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-4EC3F6CF-0309-4E6F-9401-408F9A514202" id="BPMNEdge_sid-4EC3F6CF-0309-4E6F-9401-408F9A514202">
-                <omgdi:waypoint x="1196.0" y="123.99999735090523"></omgdi:waypoint>
-                <omgdi:waypoint x="1196.0" y="208.0"></omgdi:waypoint>
-                <omgdi:waypoint x="355.0" y="208.0"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
-                <omgdi:waypoint x="1366.0" y="103.99999735090495"></omgdi:waypoint>
-                <omgdi:waypoint x="1401.0" y="103.9999973509048"></omgdi:waypoint>
+                <omgdi:waypoint x="1156.0" y="123.99999735090523"></omgdi:waypoint>
+                <omgdi:waypoint x="1156.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-6A7B4FFF-D815-4522-93E3-ACA3E92104EE" id="BPMNEdge_sid-6A7B4FFF-D815-4522-93E3-ACA3E92104EE">
-                <omgdi:waypoint x="2093.999999610427" y="103.99999774047755"></omgdi:waypoint>
-                <omgdi:waypoint x="2196.0" y="103.99999972729901"></omgdi:waypoint>
+                <omgdi:waypoint x="2373.9999993028696" y="103.99999804803504"></omgdi:waypoint>
+                <omgdi:waypoint x="2416.0" y="103.99999951200877"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-2C1CFE3F-7499-4D09-8CCF-F3B478BD034F" id="BPMNEdge_sid-2C1CFE3F-7499-4D09-8CCF-F3B478BD034F">
+                <omgdi:waypoint x="2115.575713489989" y="104.42428651001079"></omgdi:waypoint>
+                <omgdi:waypoint x="2155.9473684210525" y="104.2640472144754"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-3672511A-1AB6-4E2B-9106-12CAFB9A20E2" id="BPMNEdge_sid-3672511A-1AB6-4E2B-9106-12CAFB9A20E2">
-                <omgdi:waypoint x="2009.0" y="103.99999735090472"></omgdi:waypoint>
-                <omgdi:waypoint x="2054.0" y="103.99999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="2289.0" y="103.99999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="2334.0" y="103.99999735090472"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-0E69FCAF-5296-4A81-B326-29A61FB45AA7" id="BPMNEdge_sid-0E69FCAF-5296-4A81-B326-29A61FB45AA7">
-                <omgdi:waypoint x="550.0" y="123.0"></omgdi:waypoint>
-                <omgdi:waypoint x="550.0" y="208.0"></omgdi:waypoint>
-                <omgdi:waypoint x="355.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="510.0" y="123.0"></omgdi:waypoint>
+                <omgdi:waypoint x="510.0" y="208.0"></omgdi:waypoint>
+                <omgdi:waypoint x="315.0" y="208.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-DFEE94DC-E1AE-4D57-8A48-0DF304FDDF15" id="BPMNEdge_sid-DFEE94DC-E1AE-4D57-8A48-0DF304FDDF15">
+                <omgdi:waypoint x="1551.0" y="103.99999735090498"></omgdi:waypoint>
+                <omgdi:waypoint x="1601.0" y="103.99999735090479"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
-                <omgdi:waypoint x="790.0" y="103.0"></omgdi:waypoint>
-                <omgdi:waypoint x="815.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="750.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="775.0" y="103.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-1C4E0AB0-14F9-4EC5-8D09-DB98FAF51BE6" id="BPMNEdge_sid-1C4E0AB0-14F9-4EC5-8D09-DB98FAF51BE6">
-                <omgdi:waypoint x="325.0" y="103.0"></omgdi:waypoint>
-                <omgdi:waypoint x="385.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="285.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="345.0" y="103.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-637038EC-94DC-4E86-8DFC-D0FE2A45FB07" id="BPMNEdge_sid-637038EC-94DC-4E86-8DFC-D0FE2A45FB07">
+                <omgdi:waypoint x="2031.0" y="104.21645021645021"></omgdi:waypoint>
+                <omgdi:waypoint x="2076.413043478261" y="104.41304347826087"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-16929529-744D-4509-923E-820FA2E3AEE3" id="BPMNEdge_sid-16929529-744D-4509-923E-820FA2E3AEE3">
-                <omgdi:waypoint x="1650.9999996467873" y="103.99999770411786"></omgdi:waypoint>
-                <omgdi:waypoint x="1731.0" y="103.99999911696841"></omgdi:waypoint>
+                <omgdi:waypoint x="1850.9999996467873" y="103.99999770411786"></omgdi:waypoint>
+                <omgdi:waypoint x="1931.0" y="103.99999911696841"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-C8320F28-BF8F-4B0D-AAB8-5D32DBAA3413" id="BPMNEdge_sid-C8320F28-BF8F-4B0D-AAB8-5D32DBAA3413">
-                <omgdi:waypoint x="100.0" y="103.0"></omgdi:waypoint>
-                <omgdi:waypoint x="130.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="60.0" y="103.0"></omgdi:waypoint>
+                <omgdi:waypoint x="90.0" y="103.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-45DED472-AC98-4ED3-B1EE-3EE6305F1413" id="BPMNEdge_sid-45DED472-AC98-4ED3-B1EE-3EE6305F1413">
-                <omgdi:waypoint x="305.0" y="83.0"></omgdi:waypoint>
-                <omgdi:waypoint x="305.0" y="30.0"></omgdi:waypoint>
-                <omgdi:waypoint x="670.0" y="30.0"></omgdi:waypoint>
-                <omgdi:waypoint x="670.0" y="63.0"></omgdi:waypoint>
+                <omgdi:waypoint x="265.0" y="83.0"></omgdi:waypoint>
+                <omgdi:waypoint x="265.0" y="30.0"></omgdi:waypoint>
+                <omgdi:waypoint x="630.0" y="30.0"></omgdi:waypoint>
+                <omgdi:waypoint x="630.0" y="63.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D683E891-1671-40A6-9103-C03866D0640B" id="BPMNEdge_sid-D683E891-1671-40A6-9103-C03866D0640B">
-                <omgdi:waypoint x="1631.0" y="83.99999735090523"></omgdi:waypoint>
-                <omgdi:waypoint x="1631.0" y="33.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1942.0" y="33.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1942.2101556610346" y="64.49999735090472"></omgdi:waypoint>
+                <omgdi:waypoint x="1831.0" y="83.99999735090523"></omgdi:waypoint>
+                <omgdi:waypoint x="1831.0" y="33.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2222.4736842105262" y="33.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2222.4736842105262" y="64.49999735090472"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-5D55B4DC-21FF-4637-BCC7-6C25F06523A3" id="BPMNEdge_sid-5D55B4DC-21FF-4637-BCC7-6C25F06523A3">
-                <omgdi:waypoint x="305.0" y="168.0"></omgdi:waypoint>
-                <omgdi:waypoint x="305.0" y="123.0"></omgdi:waypoint>
+                <omgdi:waypoint x="265.0" y="168.0"></omgdi:waypoint>
+                <omgdi:waypoint x="265.0" y="123.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
-                <omgdi:waypoint x="915.0" y="103.45044925716428"></omgdi:waypoint>
-                <omgdi:waypoint x="956.1785709597424" y="103.82142639116235"></omgdi:waypoint>
+                <omgdi:waypoint x="875.0" y="103.45044925716428"></omgdi:waypoint>
+                <omgdi:waypoint x="916.1785709597424" y="103.82142639116235"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
         </bpmndi:BPMNPlane>
     </bpmndi:BPMNDiagram>