信息变更返回分办不可驳回

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

@@ -86,24 +86,6 @@
             </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>
-        <sequenceFlow id="sid-2116D691-BD6C-4ABA-9346-27611BD512E7" sourceRef="sid-6FDA29DE-91D5-439A-AFF8-CE518926AEC1" targetRef="sid-3A58E678-9DAB-4D47-94DD-A87555607A9A"></sequenceFlow>
-        <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-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}">
@@ -114,15 +96,19 @@
             </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">
+        <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>
+        <sequenceFlow id="sid-2116D691-BD6C-4ABA-9346-27611BD512E7" sourceRef="sid-6FDA29DE-91D5-439A-AFF8-CE518926AEC1" targetRef="sid-3A58E678-9DAB-4D47-94DD-A87555607A9A"></sequenceFlow>
+        <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="end" delegateExpression="${changeApprovalRefuseService}">
-                    <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-10]]></activiti:string>
-                    </activiti:field>
-                </activiti:executionListener>
+                <activiti:executionListener event="start" delegateExpression="${changeCheckNeedPayService}"></activiti:executionListener>
             </extensionElements>
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_info_change">
@@ -169,9 +155,6 @@
             <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>
@@ -221,15 +204,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>
@@ -242,18 +225,9 @@
                 <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-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 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>
             <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>