Procházet zdrojové kódy

准入 增项 年审 二级单位分办 业务处室分办 可以退回

baichengfei před 5 roky
rodič
revize
cc2474a1a7

+ 2 - 0
src/main/java/com/common/workflow/service/activiti/contractAnnualEvaluationListener/EvaluateApprovalRefuseService.java

@@ -42,6 +42,8 @@ public class EvaluateApprovalRefuseService implements ExecutionListener {
             delegateExecution.setVariableLocal("refuseName", "专业处室未通过");
         } else if (nowStepCode.equals("-9")) {
             delegateExecution.setVariableLocal("refuseName", "企管法规处未通过");
+        } else if (nowStepCode.equals("-10")) {
+            delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
         System.out.println("合同年度评审 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);

+ 2 - 0
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateApprovalRefuseService.java

@@ -42,6 +42,8 @@ public class EvaluateApprovalRefuseService implements ExecutionListener {
             delegateExecution.setVariableLocal("refuseName", "专业处室未通过");
         } else if (nowStepCode.equals("-9")) {
             delegateExecution.setVariableLocal("refuseName", "企管法规处未通过");
+        } else if (nowStepCode.equals("-10")) {
+            delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
         System.out.println("合同日常评审 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);

+ 2 - 0
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualApprovalRefuseService.java

@@ -44,6 +44,8 @@ public class AnnualApprovalRefuseService implements ExecutionListener {
             delegateExecution.setVariableLocal("refuseName", "集中评审未通过");
         } else if (nowStepCode.equals("-9")) {
             delegateExecution.setVariableLocal("refuseName", "企管法规处未通过");
+        } else if (nowStepCode.equals("-10")) {
+            delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
         System.out.println("年审工作流 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);

+ 2 - 0
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendApprovalRefuseService.java

@@ -44,6 +44,8 @@ public class AppendApprovalRefuseService implements ExecutionListener {
             delegateExecution.setVariableLocal("refuseName", "集中评审未通过");
         } else if (nowStepCode.equals("-9")) {
             delegateExecution.setVariableLocal("refuseName", "企管法规处未通过");
+        } else if (nowStepCode.equals("-10")) {
+            delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
         System.out.println("增项工作流 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);

+ 2 - 0
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeApprovalRefuseService.java

@@ -44,6 +44,8 @@ public class ChangeApprovalRefuseService implements ExecutionListener {
             delegateExecution.setVariableLocal("refuseName", "集中评审未通过");
         } else if (nowStepCode.equals("-9")) {
             delegateExecution.setVariableLocal("refuseName", "企管法规处未通过");
+        } else if (nowStepCode.equals("-10")) {
+            delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
         System.out.println("信息变更工作流 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);

+ 2 - 0
src/main/java/com/common/workflow/service/activiti/supplierListener/ApprovalRefuseService.java

@@ -43,6 +43,8 @@ public class ApprovalRefuseService implements ExecutionListener {
             delegateExecution.setVariableLocal("refuseName", "集中评审未通过");
         } else if (nowStepCode.equals("-9")) {
             delegateExecution.setVariableLocal("refuseName", "企管法规处未通过");
+        } else if (nowStepCode.equals("-10")) {
+            delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
 
         delegateExecution.setVariable("backUsers", createUserId);

+ 62 - 38
src/main/resources/processes/oil_audit_apply.bpmn20.xml

@@ -52,9 +52,6 @@
         <sequenceFlow id="sid-002682E5-FF90-4A74-8707-0F8B98C09674" name="通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-D8EF8E5C-09F6-447F-8D74-3487CC461350" sourceRef="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8">
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-        </sequenceFlow>
         <sequenceFlow id="sid-D779A6CC-563C-4A97-ADE7-1B669C622454" sourceRef="sid-0B124434-FDAD-4E82-91CB-E570A44E7FF3" targetRef="sid-9A4454BD-9A0F-4B81-B482-BA2179020366"></sequenceFlow>
         <sequenceFlow id="sid-F79F4B30-54D3-445C-8761-786B5151F0DC" sourceRef="startEvent1" targetRef="sid-0B124434-FDAD-4E82-91CB-E570A44E7FF3"></sequenceFlow>
         <sequenceFlow id="sid-4FDD2371-4005-422A-8183-71F35A0A0808" name="通过" sourceRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" targetRef="sid-50701969-FF27-4BDF-91F2-90BB786BA878">
@@ -71,16 +68,6 @@
                 <activiti:taskListener event="create" delegateExpression="${approvalRefuseTaskService}"></activiti:taskListener>
             </extensionElements>
         </userTask>
-        <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}">
-                    <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-1]]></activiti:string>
-                    </activiti:field>
-                </activiti:executionListener>
-            </extensionElements>
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-        </sequenceFlow>
         <sequenceFlow id="sid-F39CE67A-02DA-44CB-A534-968088FC5F18" name="不通过" sourceRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D" targetRef="sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${annualApprovalRefuseService}">
@@ -129,14 +116,39 @@
                 </activiti:executionListener>
             </extensionElements>
         </sequenceFlow>
+        <exclusiveGateway id="sid-63F0BADC-54D1-4705-8052-0CD44FC80818"></exclusiveGateway>
+        <sequenceFlow id="sid-65D3E28C-4277-4F66-86FC-AA40A40A8944" sourceRef="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8" targetRef="sid-63F0BADC-54D1-4705-8052-0CD44FC80818"></sequenceFlow>
+        <sequenceFlow id="sid-B5D30E6E-5BFF-4F4B-82ED-9FFFA10130AA" sourceRef="sid-63F0BADC-54D1-4705-8052-0CD44FC80818" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></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}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-1]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-595990A9-C9A0-4D46-B4D5-39940D0F71DF" name="不通过" sourceRef="sid-63F0BADC-54D1-4705-8052-0CD44FC80818" targetRef="sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD">
+            <extensionElements>
+                <activiti:executionListener event="end" delegateExpression="${annualApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-10]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </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="180.0" y="643.0000000000005"></omgdc:Bounds>
+                <omgdc:Bounds height="30.0" width="30.0" x="100.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="1665.0000000000002" y="644.0000000000005"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="1675.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="645.0" y="618.0000000000005"></omgdc:Bounds>
@@ -148,10 +160,10 @@
                 <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.0" width="100.0" x="245.0" y="619.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="165.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="495.0" y="618.0000000000005"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="415.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="990.0" y="638.0000000000005"></omgdc:Bounds>
@@ -160,7 +172,7 @@
                 <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="385.0" y="638.0000000000005"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="305.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="1212.0" y="638.0000000000005"></omgdc:Bounds>
@@ -172,18 +184,25 @@
                 <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="355.0" y="720.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="275.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:BPMNShape bpmnElement="sid-63F0BADC-54D1-4705-8052-0CD44FC80818" id="BPMNShape_sid-63F0BADC-54D1-4705-8052-0CD44FC80818">
+                <omgdc:Bounds height="40.0" width="40.0" x="560.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="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="405.0" y="720.0"></omgdi:waypoint>
-                <omgdi:waypoint x="405.0" y="678.0000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="325.0" y="720.0"></omgdi:waypoint>
+                <omgdi:waypoint x="325.0" y="678.0000000000005"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-B5D30E6E-5BFF-4F4B-82ED-9FFFA10130AA" id="BPMNEdge_sid-B5D30E6E-5BFF-4F4B-82ED-9FFFA10130AA">
+                <omgdi:waypoint x="599.5833333333334" y="658.4166666666671"></omgdi:waypoint>
+                <omgdi:waypoint x="645.0" y="658.2183406113542"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2F6390F0-B470-4949-965D-F95510CF8844" id="BPMNEdge_sid-2F6390F0-B470-4949-965D-F95510CF8844">
                 <omgdi:waypoint x="1232.5" y="638.5000000000005"></omgdi:waypoint>
@@ -194,34 +213,39 @@
             <bpmndi:BPMNEdge bpmnElement="sid-F39CE67A-02DA-44CB-A534-968088FC5F18" id="BPMNEdge_sid-F39CE67A-02DA-44CB-A534-968088FC5F18">
                 <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>
+                <omgdi:waypoint x="375.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="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="424.568345323741" y="658.4316546762594"></omgdi:waypoint>
-                <omgdi:waypoint x="495.0" y="658.1792114695345"></omgdi:waypoint>
+                <omgdi:waypoint x="344.568345323741" y="658.4316546762594"></omgdi:waypoint>
+                <omgdi:waypoint x="415.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>
+                <omgdi:waypoint x="375.0" y="760.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-595990A9-C9A0-4D46-B4D5-39940D0F71DF" id="BPMNEdge_sid-595990A9-C9A0-4D46-B4D5-39940D0F71DF">
+                <omgdi:waypoint x="580.5" y="677.5000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="580.5" y="760.0"></omgdi:waypoint>
+                <omgdi:waypoint x="375.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="405.5" y="638.5000000000005"></omgdi:waypoint>
-                <omgdi:waypoint x="405.5" y="587.0144729614258"></omgdi:waypoint>
+                <omgdi:waypoint x="325.5" y="638.5000000000005"></omgdi:waypoint>
+                <omgdi:waypoint x="325.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="345.0" y="658.7737556561088"></omgdi:waypoint>
-                <omgdi:waypoint x="385.59009009009003" y="658.5900900900905"></omgdi:waypoint>
+                <omgdi:waypoint x="265.0" y="658.7737556561088"></omgdi:waypoint>
+                <omgdi:waypoint x="305.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="1397.0" y="658.0000000000005"></omgdi:waypoint>
@@ -230,12 +254,12 @@
             <bpmndi:BPMNEdge bpmnElement="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" id="BPMNEdge_sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163">
                 <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>
+                <omgdi:waypoint x="375.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="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>
+                <omgdi:waypoint x="375.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="1180.0" y="658.2439024390249"></omgdi:waypoint>
@@ -246,20 +270,20 @@
                 <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="209.9992500562453" y="658.1499925005628"></omgdi:waypoint>
-                <omgdi:waypoint x="245.0" y="658.5000000000002"></omgdi:waypoint>
+                <omgdi:waypoint x="129.9992500562453" y="658.1499925005628"></omgdi:waypoint>
+                <omgdi:waypoint x="165.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="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>
+                <omgdi:waypoint x="1626.6172839506173" y="658.3827160493831"></omgdi:waypoint>
+                <omgdi:waypoint x="1675.0002634575037" y="658.085887954249"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-D8EF8E5C-09F6-447F-8D74-3487CC461350" id="BPMNEdge_sid-D8EF8E5C-09F6-447F-8D74-3487CC461350">
-                <omgdi:waypoint x="595.0" y="658.0000000000005"></omgdi:waypoint>
-                <omgdi:waypoint x="645.0" y="658.0000000000005"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-65D3E28C-4277-4F66-86FC-AA40A40A8944" id="BPMNEdge_sid-65D3E28C-4277-4F66-86FC-AA40A40A8944">
+                <omgdi:waypoint x="515.0" y="658.2164502164507"></omgdi:waypoint>
+                <omgdi:waypoint x="560.4130434782609" y="658.4130434782613"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-002682E5-FF90-4A74-8707-0F8B98C09674" id="BPMNEdge_sid-002682E5-FF90-4A74-8707-0F8B98C09674">
                 <omgdi:waypoint x="819.5913461538462" y="658.4086538461543"></omgdi:waypoint>

+ 151 - 99
src/main/resources/processes/oil_enuser_append_apply.bpmn20.xml

@@ -59,16 +59,11 @@
             </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-22C499F4-7179-4558-BC4C-77EF7453FA56" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></sequenceFlow>
-        <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>
         <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>
         </sequenceFlow>
         <sequenceFlow id="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" sourceRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" targetRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></sequenceFlow>
-        <sequenceFlow id="sid-D6D3EE5B-D83D-4D08-A781-CCCEB6AF9412" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
         <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>
@@ -85,195 +80,252 @@
         </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">
+        <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[-1]]></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-E20D16A1-7AC4-40EF-BAA3-FC171BF0F8D3" name="不通过" sourceRef="sid-23C9D008-0522-4173-924B-616B0B9E2A1B" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
+        <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-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>
+        <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">
             <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">
+        <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}">
                     <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-2]]></activiti:string>
+                        <activiti:string><![CDATA[-1]]></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">
+        <sequenceFlow id="sid-D928C4F4-1CC5-4B2E-B9C4-6135ADAC4517" name="不通过" sourceRef="sid-36DC6E30-FACE-41C2-BBAA-E7F281771043" targetRef="sid-1962BDA1-E48A-4906-BDFB-6B18A9BF4054">
+            <extensionElements>
+                <activiti:executionListener event="end" delegateExpression="${appendApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-10]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
+        <exclusiveGateway id="sid-73C82021-679A-4A47-9AF2-45061DC7AED6"></exclusiveGateway>
+        <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">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${appendApprovalRefuseService}">
                     <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-7]]></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-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-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>
+        <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>
     </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="275.0" y="280.0"></omgdc:Bounds>
+                <omgdc:Bounds height="30.0" width="30.0" x="75.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="575.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="375.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="1250.0" y="255.00000000000006"></omgdc:Bounds>
+                <omgdc:Bounds height="79.99999999999994" width="100.0" x="1245.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="100.0" x="920.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="820.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="1040.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="940.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="710.0" y="255.00000000000003"></omgdc:Bounds>
+                <omgdc:Bounds height="79.99999999999997" width="100.0" x="610.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="845.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="745.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="1840.0" y="281.0"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="1835.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="1115.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1015.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="340.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="140.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="1380.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1375.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="1465.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1460.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="1610.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1605.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="485.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="285.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="455.0" y="360.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="255.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>
+                <omgdc:Bounds height="40.0" width="40.0" x="1750.0" y="275.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="275.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <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="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="1350.0" y="295.00970873786406"></omgdi:waypoint>
-                <omgdi:waypoint x="1380.3039215686274" y="295.30392156862746"></omgdi:waypoint>
+                <omgdi:waypoint x="1345.0" y="295.00970873786406"></omgdi:waypoint>
+                <omgdi:waypoint x="1375.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="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="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="1565.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1610.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="710.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="745.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="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 bpmnElement="sid-AE739CF6-1E52-4771-ACA4-8B0AA6192002" id="BPMNEdge_sid-AE739CF6-1E52-4771-ACA4-8B0AA6192002">
+                <omgdi:waypoint x="559.5798319327731" y="295.4201680672269"></omgdi:waypoint>
+                <omgdi:waypoint x="610.0" y="295.2092050209205"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-67A5C40B-EF7D-42AC-8543-BC1E0CB1BDE2" id="BPMNEdge_sid-67A5C40B-EF7D-42AC-8543-BC1E0CB1BDE2">
-                <omgdi:waypoint x="524.5798319327731" y="295.4201680672269"></omgdi:waypoint>
-                <omgdi:waypoint x="575.0" y="295.20920502092054"></omgdi:waypoint>
+                <omgdi:waypoint x="324.5798319327731" y="295.4201680672269"></omgdi:waypoint>
+                <omgdi:waypoint x="375.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>
+                <omgdi:waypoint x="1789.6317871464182" y="295.3682128535819"></omgdi:waypoint>
+                <omgdi:waypoint x="1835.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="305.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="340.0" y="295.0"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-39001E8D-7208-4665-A526-1B732527D78F" id="BPMNEdge_sid-39001E8D-7208-4665-A526-1B732527D78F">
+                <omgdi:waypoint x="1115.0" y="295.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="1160.4130434782608" y="295.4130434782609"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
-                <omgdi:waypoint x="884.5913461538462" y="295.40865384615387"></omgdi:waypoint>
-                <omgdi:waypoint x="920.0" y="295.2392344497608"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-2A034CD8-BB86-4783-97D9-DBAE8D4A7199" id="BPMNEdge_sid-2A034CD8-BB86-4783-97D9-DBAE8D4A7199">
+                <omgdi:waypoint x="105.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="140.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-AA46B27B-7C3C-4586-BB9D-28AC48B16F5E" id="BPMNEdge_sid-AA46B27B-7C3C-4586-BB9D-28AC48B16F5E">
-                <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>
+                <omgdi:waypoint x="765.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="765.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="355.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="1215.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1250.0" y="295.0"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-E3C916E1-A5A4-4923-A44F-4900CD32425E" id="BPMNEdge_sid-E3C916E1-A5A4-4923-A44F-4900CD32425E">
+                <omgdi:waypoint x="1199.5833333333333" y="295.4166666666667"></omgdi:waypoint>
+                <omgdi:waypoint x="1245.0" y="295.2183406113537"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-8E11FCEE-5E6E-4C47-84E1-448933CB3E94" id="BPMNEdge_sid-8E11FCEE-5E6E-4C47-84E1-448933CB3E94">
-                <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="1079.5913461538462" y="295.40865384615387"></omgdi:waypoint>
-                <omgdi:waypoint x="1115.0" y="295.2392344497608"></omgdi:waypoint>
+                <omgdi:waypoint x="960.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="960.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="355.0" y="400.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="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>
+                <omgdi:waypoint x="1395.5" y="275.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1395.5" y="222.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="1655.0" y="222.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="1655.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="440.0" y="295.2164502164502"></omgdi:waypoint>
-                <omgdi:waypoint x="485.4130434782609" y="295.4130434782609"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
+                <omgdi:waypoint x="979.5913461538462" y="295.40865384615387"></omgdi:waypoint>
+                <omgdi:waypoint x="1015.0" y="295.2392344497608"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
-                <omgdi:waypoint x="1020.0" y="295.00000000000006"></omgdi:waypoint>
-                <omgdi:waypoint x="1040.0" y="295.0000000000001"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-D5B0EDC0-E1F6-4DF3-8769-47C8468EFED2" id="BPMNEdge_sid-D5B0EDC0-E1F6-4DF3-8769-47C8468EFED2">
+                <omgdi:waypoint x="240.0" y="295.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="285.4130434782609" y="295.4130434782609"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-5DF00195-C2A6-4F61-A585-A29C83728B82" id="BPMNEdge_sid-5DF00195-C2A6-4F61-A585-A29C83728B82">
-                <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>
+                <omgdi:waypoint x="305.5" y="275.5"></omgdi:waypoint>
+                <omgdi:waypoint x="305.5" y="230.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="660.0" y="230.0162811279297"></omgdi:waypoint>
+                <omgdi:waypoint x="660.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>
+                <omgdi:waypoint x="1705.0" y="295.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="1750.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 bpmnElement="sid-F5F08BDE-2393-4D89-85D3-C40C6199CF5B" id="BPMNEdge_sid-F5F08BDE-2393-4D89-85D3-C40C6199CF5B">
+                <omgdi:waypoint x="1414.5833333333333" y="295.4166666666667"></omgdi:waypoint>
+                <omgdi:waypoint x="1460.0" y="295.2183406113537"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-D6D3EE5B-D83D-4D08-A781-CCCEB6AF9412" id="BPMNEdge_sid-D6D3EE5B-D83D-4D08-A781-CCCEB6AF9412">
-                <omgdi:waypoint x="675.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="710.0" y="295.0"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-470B68DC-C977-4A10-809B-6D1736C78F65" id="BPMNEdge_sid-470B68DC-C977-4A10-809B-6D1736C78F65">
+                <omgdi:waypoint x="1180.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1180.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="355.0" y="400.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="1419.5833333333333" y="295.4166666666667"></omgdi:waypoint>
-                <omgdi:waypoint x="1465.0" y="295.2183406113537"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-4C52C3E7-9EEF-4D1F-9EF2-56C9F94FFB95" id="BPMNEdge_sid-4C52C3E7-9EEF-4D1F-9EF2-56C9F94FFB95">
+                <omgdi:waypoint x="305.0" y="360.0"></omgdi:waypoint>
+                <omgdi:waypoint x="305.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="1560.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1605.0" y="295.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.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="540.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="355.0" y="400.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.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1395.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="355.0" y="400.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="784.5913461538462" y="295.40865384615387"></omgdi:waypoint>
+                <omgdi:waypoint x="820.0" y="295.2392344497608"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-0A52E255-1A50-4E8C-B374-9421D6E04D76" id="BPMNEdge_sid-0A52E255-1A50-4E8C-B374-9421D6E04D76">
+                <omgdi:waypoint x="475.0" y="295.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="520.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="920.0" y="295.00000000000006"></omgdi:waypoint>
+                <omgdi:waypoint x="939.9999999999999" y="295.0000000000001"></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.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1770.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="355.0" y="400.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
         </bpmndi:BPMNPlane>
     </bpmndi:BPMNDiagram>

+ 161 - 109
src/main/resources/processes/oil_enuser_supplier_apply.bpmn20.xml

@@ -62,10 +62,6 @@
         <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-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>
-        <sequenceFlow id="sid-3E3D56A7-2EE5-42D1-AB6D-2892B8D3E794" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></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>
@@ -74,7 +70,6 @@
                 <activiti:executionListener event="end" delegateExpression="${checkNeedPayService}"></activiti:executionListener>
             </extensionElements>
         </sequenceFlow>
-        <sequenceFlow id="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></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>
@@ -89,243 +84,300 @@
         <sequenceFlow id="sid-E19E2941-6B2A-4114-B292-5D789BA0959A" name="通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></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>
         <userTask id="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1" name="审批未通过" activiti:candidateUsers="${users}">
             <extensionElements>
                 <activiti:taskListener event="create" delegateExpression="${approvalRefuseTaskService}"></activiti:taskListener>
             </extensionElements>
         </userTask>
         <sequenceFlow id="sid-5D55B4DC-21FF-4637-BCC7-6C25F06523A3" sourceRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1" targetRef="sid-643A5BA6-748C-4D18-96A0-EE1D2C03DEFE"></sequenceFlow>
-        <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+        <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
             <extensionElements>
                 <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
                     <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-1]]></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-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+        <exclusiveGateway id="sid-73F4C8B5-B562-4109-821B-377B94E5D84C"></exclusiveGateway>
+        <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[-2]]></activiti:string>
+                        <activiti:string><![CDATA[-5]]></activiti:string>
                     </activiti:field>
                 </activiti:executionListener>
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <exclusiveGateway id="sid-73F4C8B5-B562-4109-821B-377B94E5D84C"></exclusiveGateway>
+        <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>
         <sequenceFlow id="sid-3672511A-1AB6-4E2B-9106-12CAFB9A20E2" sourceRef="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600" targetRef="sid-73F4C8B5-B562-4109-821B-377B94E5D84C"></sequenceFlow>
-        <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+        <sequenceFlow id="sid-6A7B4FFF-D815-4522-93E3-ACA3E92104EE" sourceRef="sid-73F4C8B5-B562-4109-821B-377B94E5D84C" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-88A209D3-7FCC-4045-97A7-D53AA9760CE8" sourceRef="sid-73F4C8B5-B562-4109-821B-377B94E5D84C" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
             <extensionElements>
                 <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
                     <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-FD0572E4-B0BC-49D2-9F15-C38057F3D170" name="不通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+        <exclusiveGateway id="sid-5A29A6AC-9AF4-444E-A458-C3C3E075998C"></exclusiveGateway>
+        <sequenceFlow id="sid-4B9FFFB8-8CC6-4D7B-B5BA-1DD0BE92AF50" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-5A29A6AC-9AF4-444E-A458-C3C3E075998C"></sequenceFlow>
+        <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" 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:string><![CDATA[-1]]></activiti:string>
                     </activiti:field>
                 </activiti:executionListener>
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-6A7B4FFF-D815-4522-93E3-ACA3E92104EE" sourceRef="sid-73F4C8B5-B562-4109-821B-377B94E5D84C" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+        <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>
         </sequenceFlow>
-        <sequenceFlow id="sid-88A209D3-7FCC-4045-97A7-D53AA9760CE8" sourceRef="sid-73F4C8B5-B562-4109-821B-377B94E5D84C" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
+        <sequenceFlow id="sid-2318E253-9ABF-4780-BFA6-B4AAB8979338" name="通过" sourceRef="sid-5A29A6AC-9AF4-444E-A458-C3C3E075998C" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></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">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-0E69FCAF-5296-4A81-B326-29A61FB45AA7" name="不通过" sourceRef="sid-5A29A6AC-9AF4-444E-A458-C3C3E075998C" targetRef="sid-8360D2EE-369C-4BB9-B422-6CDEE851FEC1">
             <extensionElements>
                 <activiti:executionListener event="end" delegateExpression="${approvalRefuseService}">
                     <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-7]]></activiti:string>
+                        <activiti:string><![CDATA[-10]]></activiti:string>
                     </activiti:field>
                 </activiti:executionListener>
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+        <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-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[-4]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></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-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 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>
     </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="75.0" y="280.0"></omgdc:Bounds>
+                <omgdc:Bounds height="30.0" width="30.0" x="155.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="390.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="470.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="1071.0" y="255.99999735090518"></omgdc:Bounds>
+                <omgdc:Bounds height="79.99999999999994" width="100.0" x="1351.0" y="255.99999735090518"></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="1206.0" y="275.9999973509047"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1486.0" y="275.9999973509047"></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="720.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="900.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="861.0" y="275.9999973509047"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1041.0" y="275.9999973509047"></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="525.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="79.99999999999994" width="100.0" x="705.0" y="255.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="655.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="835.0" y="275.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="1281.0" y="255.99999735090472"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.00000000000023" x="1561.0" y="255.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="1941.0" y="282.0"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="2281.0" y="282.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="936.0" y="255.99999735090523"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1116.0" y="255.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="135.0" y="255.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="215.0" y="255.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="290.0" y="275.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="370.0" y="275.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="1536.0" y="256.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1816.0" y="256.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="1680.9473684210525" y="256.4999973509047"></omgdc:Bounds>
+                <omgdc:Bounds height="79.0" width="133.0526315789475" x="1960.9473684210525" y="256.4999973509047"></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="1416.0" y="275.99999735090523"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1696.0" y="275.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="260.0" y="360.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="340.0" y="360.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="1859.0" y="275.9999973509047"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="2139.0" y="275.9999973509047"></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="615.0" y="275.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="1261.0" y="275.99999735090523"></omgdc:Bounds>
             </bpmndi:BPMNShape>
+            <bpmndi:BPMNEdge bpmnElement="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" id="BPMNEdge_sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170">
+                <omgdi:waypoint x="1716.0" y="315.99999735090523"></omgdi:waypoint>
+                <omgdi:waypoint x="1716.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="440.0" y="400.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="1226.0" y="315.9999973509047"></omgdi:waypoint>
-                <omgdi:waypoint x="1226.0" y="400.0"></omgdi:waypoint>
-                <omgdi:waypoint x="360.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1506.0" y="315.9999973509047"></omgdi:waypoint>
+                <omgdi:waypoint x="1506.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="440.0" y="400.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="1436.0" y="315.99999735090523"></omgdi:waypoint>
-                <omgdi:waypoint x="1436.0" y="400.0"></omgdi:waypoint>
-                <omgdi:waypoint x="360.0" y="400.0"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-2318E253-9ABF-4780-BFA6-B4AAB8979338" id="BPMNEdge_sid-2318E253-9ABF-4780-BFA6-B4AAB8979338">
+                <omgdi:waypoint x="654.5798319327731" y="295.4201680672269"></omgdi:waypoint>
+                <omgdi:waypoint x="705.0" y="295.2092050209205"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
-                <omgdi:waypoint x="625.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="655.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="805.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="835.0" y="295.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="1636.0" y="295.999999179713"></omgdi:waypoint>
-                <omgdi:waypoint x="1680.9473684210525" y="295.99999844231814"></omgdi:waypoint>
+                <omgdi:waypoint x="1916.0" y="295.999999179713"></omgdi:waypoint>
+                <omgdi:waypoint x="1960.9473684210525" y="295.99999844231814"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-F5AEDECD-FD07-4C0B-85F9-EA3650C05E7D" id="BPMNEdge_sid-F5AEDECD-FD07-4C0B-85F9-EA3650C05E7D">
-                <omgdi:waypoint x="235.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="290.0" y="295.0"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-2ED3E036-000C-46C5-BDEA-58A0F3D17270" id="BPMNEdge_sid-2ED3E036-000C-46C5-BDEA-58A0F3D17270">
+                <omgdi:waypoint x="1216.0" y="296.21644756735543"></omgdi:waypoint>
+                <omgdi:waypoint x="1261.4130434782608" y="296.4130408291661"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
-                <omgdi:waypoint x="901.0000000000001" y="295.99999735090483"></omgdi:waypoint>
-                <omgdi:waypoint x="936.0" y="295.999997350905"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-F5AEDECD-FD07-4C0B-85F9-EA3650C05E7D" id="BPMNEdge_sid-F5AEDECD-FD07-4C0B-85F9-EA3650C05E7D">
+                <omgdi:waypoint x="315.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="370.0" y="295.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="675.0" y="315.0"></omgdi:waypoint>
-                <omgdi:waypoint x="675.0" y="400.0"></omgdi:waypoint>
-                <omgdi:waypoint x="360.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="855.0" y="315.0"></omgdi:waypoint>
+                <omgdi:waypoint x="855.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="440.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="1081.0" y="295.99999735090483"></omgdi:waypoint>
+                <omgdi:waypoint x="1116.0" y="295.999997350905"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
-                <omgdi:waypoint x="1381.0000000000002" y="295.99999735090495"></omgdi:waypoint>
-                <omgdi:waypoint x="1416.0" y="295.9999973509051"></omgdi:waypoint>
+                <omgdi:waypoint x="1661.0000000000002" y="295.99999735090495"></omgdi:waypoint>
+                <omgdi:waypoint x="1696.0" y="295.9999973509051"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-88A209D3-7FCC-4045-97A7-D53AA9760CE8" id="BPMNEdge_sid-88A209D3-7FCC-4045-97A7-D53AA9760CE8">
-                <omgdi:waypoint x="1879.5" y="315.4999973509047"></omgdi:waypoint>
-                <omgdi:waypoint x="1879.5" y="400.0"></omgdi:waypoint>
-                <omgdi:waypoint x="360.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2159.5" y="315.4999973509047"></omgdi:waypoint>
+                <omgdi:waypoint x="2159.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="440.0" y="400.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="1246.0" y="295.9999973509047"></omgdi:waypoint>
-                <omgdi:waypoint x="1281.0" y="295.9999973509047"></omgdi:waypoint>
+                <omgdi:waypoint x="1526.0" y="295.9999973509047"></omgdi:waypoint>
+                <omgdi:waypoint x="1561.0" y="295.9999973509047"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
-                <omgdi:waypoint x="881.0" y="315.9999973509047"></omgdi:waypoint>
-                <omgdi:waypoint x="881.0" y="400.0"></omgdi:waypoint>
-                <omgdi:waypoint x="360.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1061.0" y="315.9999973509047"></omgdi:waypoint>
+                <omgdi:waypoint x="1061.0" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="440.0" y="400.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-D7981E44-618F-4877-9E56-B46FB2CE277D" id="BPMNEdge_sid-D7981E44-618F-4877-9E56-B46FB2CE277D">
+                <omgdi:waypoint x="1300.5798319327732" y="296.4201654181321"></omgdi:waypoint>
+                <omgdi:waypoint x="1351.0" y="296.20920237182565"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-4B9FFFB8-8CC6-4D7B-B5BA-1DD0BE92AF50" id="BPMNEdge_sid-4B9FFFB8-8CC6-4D7B-B5BA-1DD0BE92AF50">
+                <omgdi:waypoint x="570.0" y="295.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="615.4130434782609" y="295.4130434782609"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D6C377D7-98CC-4D68-B577-22E60AD1578A" id="BPMNEdge_sid-D6C377D7-98CC-4D68-B577-22E60AD1578A">
-                <omgdi:waypoint x="1226.0" y="275.9999973509047"></omgdi:waypoint>
-                <omgdi:waypoint x="1226.0" y="226.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1372.0" y="226.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1426.447761005188" y="285.55223634571706"></omgdi:waypoint>
+                <omgdi:waypoint x="1506.0" y="275.9999973509047"></omgdi:waypoint>
+                <omgdi:waypoint x="1506.0" y="226.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1652.0" y="226.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1706.447761005188" y="285.55223634571706"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-4EC3F6CF-0309-4E6F-9401-408F9A514202" id="BPMNEdge_sid-4EC3F6CF-0309-4E6F-9401-408F9A514202">
+                <omgdi:waypoint x="1281.5" y="315.49999735090523"></omgdi:waypoint>
+                <omgdi:waypoint x="1281.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="440.0" y="400.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="1171.0" y="295.9999973509049"></omgdi:waypoint>
-                <omgdi:waypoint x="1206.0" y="295.9999973509048"></omgdi:waypoint>
+                <omgdi:waypoint x="1451.0" y="295.9999973509049"></omgdi:waypoint>
+                <omgdi:waypoint x="1486.0" y="295.9999973509048"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-6A7B4FFF-D815-4522-93E3-ACA3E92104EE" id="BPMNEdge_sid-6A7B4FFF-D815-4522-93E3-ACA3E92104EE">
-                <omgdi:waypoint x="1898.9999973509048" y="296.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1941.0" y="296.0"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-3E3D56A7-2EE5-42D1-AB6D-2892B8D3E794" id="BPMNEdge_sid-3E3D56A7-2EE5-42D1-AB6D-2892B8D3E794">
-                <omgdi:waypoint x="490.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="525.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2178.999997350905" y="296.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2281.0" y="296.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-3672511A-1AB6-4E2B-9106-12CAFB9A20E2" id="BPMNEdge_sid-3672511A-1AB6-4E2B-9106-12CAFB9A20E2">
-                <omgdi:waypoint x="1814.0" y="296.2519407433703"></omgdi:waypoint>
-                <omgdi:waypoint x="1859.423969587835" y="296.42396693873985"></omgdi:waypoint>
+                <omgdi:waypoint x="2094.0" y="296.2519407433703"></omgdi:waypoint>
+                <omgdi:waypoint x="2139.423969587835" y="296.42396693873985"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-0E69FCAF-5296-4A81-B326-29A61FB45AA7" id="BPMNEdge_sid-0E69FCAF-5296-4A81-B326-29A61FB45AA7">
+                <omgdi:waypoint x="635.5" y="314.5"></omgdi:waypoint>
+                <omgdi:waypoint x="635.5" y="400.0"></omgdi:waypoint>
+                <omgdi:waypoint x="440.0" y="400.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="695.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="720.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="875.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="900.0" y="295.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="330.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="390.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="410.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="470.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-16929529-744D-4509-923E-820FA2E3AEE3" id="BPMNEdge_sid-16929529-744D-4509-923E-820FA2E3AEE3">
-                <omgdi:waypoint x="1455.9999996467873" y="295.99999770411785"></omgdi:waypoint>
-                <omgdi:waypoint x="1536.0" y="295.9999991169684"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" id="BPMNEdge_sid-22C499F4-7179-4558-BC4C-77EF7453FA56">
-                <omgdi:waypoint x="1036.0" y="295.9999973509052"></omgdi:waypoint>
-                <omgdi:waypoint x="1071.0" y="295.9999973509052"></omgdi:waypoint>
+                <omgdi:waypoint x="1735.9999996467873" y="295.99999770411785"></omgdi:waypoint>
+                <omgdi:waypoint x="1816.0" y="295.9999991169684"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-C8320F28-BF8F-4B0D-AAB8-5D32DBAA3413" id="BPMNEdge_sid-C8320F28-BF8F-4B0D-AAB8-5D32DBAA3413">
-                <omgdi:waypoint x="105.0" y="295.0"></omgdi:waypoint>
-                <omgdi:waypoint x="135.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="185.0" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="215.0" y="295.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="310.0" y="275.0"></omgdi:waypoint>
-                <omgdi:waypoint x="310.0" y="222.0"></omgdi:waypoint>
-                <omgdi:waypoint x="575.0" y="222.0"></omgdi:waypoint>
-                <omgdi:waypoint x="575.0" y="255.0"></omgdi:waypoint>
+                <omgdi:waypoint x="390.0" y="275.0"></omgdi:waypoint>
+                <omgdi:waypoint x="390.0" y="222.0"></omgdi:waypoint>
+                <omgdi:waypoint x="755.0" y="222.0"></omgdi:waypoint>
+                <omgdi:waypoint x="755.0" y="255.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="1436.555555575996" y="276.5555529269013"></omgdi:waypoint>
-                <omgdi:waypoint x="1438.0" y="226.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1747.0" y="225.0"></omgdi:waypoint>
-                <omgdi:waypoint x="1747.2101556610346" y="256.4999973509047"></omgdi:waypoint>
+                <omgdi:waypoint x="1716.0" y="275.99999735090523"></omgdi:waypoint>
+                <omgdi:waypoint x="1716.0" y="225.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2027.0" y="225.0"></omgdi:waypoint>
+                <omgdi:waypoint x="2027.2101556610346" y="256.4999973509047"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-5D55B4DC-21FF-4637-BCC7-6C25F06523A3" id="BPMNEdge_sid-5D55B4DC-21FF-4637-BCC7-6C25F06523A3">
-                <omgdi:waypoint x="310.0" y="360.0"></omgdi:waypoint>
-                <omgdi:waypoint x="310.0" y="315.0"></omgdi:waypoint>
+                <omgdi:waypoint x="390.0" y="360.0"></omgdi:waypoint>
+                <omgdi:waypoint x="390.0" y="315.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="820.0" y="295.4504492571643"></omgdi:waypoint>
-                <omgdi:waypoint x="861.1785709597424" y="295.82142639116233"></omgdi:waypoint>
+                <omgdi:waypoint x="1000.0" y="295.4504492571643"></omgdi:waypoint>
+                <omgdi:waypoint x="1041.1785709597423" y="295.82142639116233"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
         </bpmndi:BPMNPlane>
     </bpmndi:BPMNDiagram>

+ 44 - 18
src/main/resources/processes/oil_info_change.bpmn20.xml

@@ -86,16 +86,6 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-2FDE3724-6B91-483E-8F67-5185D6313C6F" name="不通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-E1DF7BD6-049B-45FF-93B0-0A664369CAF1">
-            <extensionElements>
-                <activiti:executionListener event="start" delegateExpression="${changeApprovalRefuseService}">
-                    <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-1]]></activiti:string>
-                    </activiti:field>
-                </activiti:executionListener>
-            </extensionElements>
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-        </sequenceFlow>
         <sequenceFlow id="sid-CC953BB1-969C-43CC-B210-409D0DD884E1" name="通过" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-0BD541A8-2AF5-407A-88F7-4BAC183231F0">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
@@ -103,13 +93,37 @@
         <sequenceFlow id="sid-73D29D57-0EEC-4F9E-8DBB-B92A7D4AB133" name="企业用户申请" sourceRef="sid-B3DA6CFC-6CD4-4C5B-A050-87745068C321" targetRef="sid-C3A26CEB-8B27-4D61-A791-763DF5641174">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-FB6D1E6A-DD15-424D-862C-69D775CC4BF0" sourceRef="sid-C3A26CEB-8B27-4D61-A791-763DF5641174" targetRef="sid-577C4501-C135-43AE-8EF8-8DB311E72798"></sequenceFlow>
         <sequenceFlow id="sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754" sourceRef="sid-577C4501-C135-43AE-8EF8-8DB311E72798" targetRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A"></sequenceFlow>
         <sequenceFlow id="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" sourceRef="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159" targetRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${changeCheckNeedPayService}"></activiti:executionListener>
             </extensionElements>
         </sequenceFlow>
+        <exclusiveGateway id="sid-2CD9B995-842C-4B0D-809C-F9F9FC652F2E"></exclusiveGateway>
+        <sequenceFlow id="sid-78EC8F80-3F6C-4D8D-A171-DA0FE5F1A2B2" sourceRef="sid-C3A26CEB-8B27-4D61-A791-763DF5641174" targetRef="sid-2CD9B995-842C-4B0D-809C-F9F9FC652F2E"></sequenceFlow>
+        <sequenceFlow id="sid-1AB8751C-63F7-4E0E-9ECB-57C79993CEAD" name="通过" sourceRef="sid-2CD9B995-842C-4B0D-809C-F9F9FC652F2E" targetRef="sid-577C4501-C135-43AE-8EF8-8DB311E72798">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-2FDE3724-6B91-483E-8F67-5185D6313C6F" name="不通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-E1DF7BD6-049B-45FF-93B0-0A664369CAF1">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${changeApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-1]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-E3CDF3BE-2623-4BF0-8E84-061FA8E8E532" name="不通过" sourceRef="sid-2CD9B995-842C-4B0D-809C-F9F9FC652F2E" targetRef="sid-E1DF7BD6-049B-45FF-93B0-0A664369CAF1">
+            <extensionElements>
+                <activiti:executionListener event="end" delegateExpression="${changeApprovalRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-10]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_info_change">
         <bpmndi:BPMNPlane bpmnElement="oil_info_change" id="BPMNPlane_oil_info_change">
@@ -155,6 +169,9 @@
             <bpmndi:BPMNShape bpmnElement="sid-E1DF7BD6-049B-45FF-93B0-0A664369CAF1" id="BPMNShape_sid-E1DF7BD6-049B-45FF-93B0-0A664369CAF1">
                 <omgdc:Bounds height="80.0" width="100.0" x="167.0" y="225.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-2CD9B995-842C-4B0D-809C-F9F9FC652F2E" id="BPMNShape_sid-2CD9B995-842C-4B0D-809C-F9F9FC652F2E">
+                <omgdc:Bounds height="40.0" width="40.0" x="442.0" y="155.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
             <bpmndi:BPMNEdge bpmnElement="sid-F1508FC5-65F1-4AE5-9EEB-9AD6EE531B10" id="BPMNEdge_sid-F1508FC5-65F1-4AE5-9EEB-9AD6EE531B10">
                 <omgdi:waypoint x="691.5913461538462" y="178.4086538461544"></omgdi:waypoint>
                 <omgdi:waypoint x="727.0" y="178.23923444976134"></omgdi:waypoint>
@@ -204,15 +221,15 @@
                 <omgdi:waypoint x="1136.5833333333333" y="178.41666666666734"></omgdi:waypoint>
                 <omgdi:waypoint x="1182.0" y="178.2183406113546"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" id="BPMNEdge_sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8">
+                <omgdi:waypoint x="1068.0" y="177.86808510638332"></omgdi:waypoint>
+                <omgdi:waypoint x="1097.2413793103447" y="178.24137931034528"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-2FDE3724-6B91-483E-8F67-5185D6313C6F" id="BPMNEdge_sid-2FDE3724-6B91-483E-8F67-5185D6313C6F">
                 <omgdi:waypoint x="672.5" y="197.50000000000057"></omgdi:waypoint>
                 <omgdi:waypoint x="672.5" y="265.0"></omgdi:waypoint>
                 <omgdi:waypoint x="267.0" y="265.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" id="BPMNEdge_sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8">
-                <omgdi:waypoint x="1068.0" y="177.86808510638332"></omgdi:waypoint>
-                <omgdi:waypoint x="1097.2413793103447" y="178.24137931034528"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-A26EFFF7-C36E-4B34-9AF1-7FF4645F64BC" id="BPMNEdge_sid-A26EFFF7-C36E-4B34-9AF1-7FF4645F64BC">
                 <omgdi:waypoint x="896.7355371900828" y="178.2644628099183"></omgdi:waypoint>
                 <omgdi:waypoint x="932.0" y="177.83265306122513"></omgdi:waypoint>
@@ -225,9 +242,18 @@
                 <omgdi:waypoint x="1427.0" y="178.0000000000005"></omgdi:waypoint>
                 <omgdi:waypoint x="1455.0" y="178.00000000000017"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-FB6D1E6A-DD15-424D-862C-69D775CC4BF0" id="BPMNEdge_sid-FB6D1E6A-DD15-424D-862C-69D775CC4BF0">
-                <omgdi:waypoint x="407.0" y="175.0"></omgdi:waypoint>
-                <omgdi:waypoint x="507.0" y="175.0"></omgdi:waypoint>
+            <bpmndi:BPMNEdge bpmnElement="sid-1AB8751C-63F7-4E0E-9ECB-57C79993CEAD" id="BPMNEdge_sid-1AB8751C-63F7-4E0E-9ECB-57C79993CEAD">
+                <omgdi:waypoint x="481.2219512195122" y="175.7780487804878"></omgdi:waypoint>
+                <omgdi:waypoint x="507.0" y="176.1608910891089"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-E3CDF3BE-2623-4BF0-8E84-061FA8E8E532" id="BPMNEdge_sid-E3CDF3BE-2623-4BF0-8E84-061FA8E8E532">
+                <omgdi:waypoint x="462.5" y="194.5"></omgdi:waypoint>
+                <omgdi:waypoint x="462.5" y="265.0"></omgdi:waypoint>
+                <omgdi:waypoint x="267.0" y="265.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-78EC8F80-3F6C-4D8D-A171-DA0FE5F1A2B2" id="BPMNEdge_sid-78EC8F80-3F6C-4D8D-A171-DA0FE5F1A2B2">
+                <omgdi:waypoint x="407.0" y="175.23696682464455"></omgdi:waypoint>
+                <omgdi:waypoint x="442.4047619047619" y="175.4047619047619"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-981820A1-45F6-4E5A-85A5-9671C3B139B9" id="BPMNEdge_sid-981820A1-45F6-4E5A-85A5-9671C3B139B9">
                 <omgdi:waypoint x="877.5" y="197.50000000000114"></omgdi:waypoint>