Bladeren bron

年审流程图bugfix

baichengfei 5 jaren geleden
bovenliggende
commit
5632b56df2
1 gewijzigde bestanden met toevoegingen van 14 en 18 verwijderingen
  1. 14 18
      src/main/resources/processes/oil_audit_apply.bpmn20.xml

+ 14 - 18
src/main/resources/processes/oil_audit_apply.bpmn20.xml

@@ -51,18 +51,9 @@
         <sequenceFlow id="sid-827D17FF-B71A-4CEF-8E35-B742839FDE94" sourceRef="sid-50701969-FF27-4BDF-91F2-90BB786BA878" targetRef="sid-C633703C-7627-495A-AFDA-0CE56BDF3BD0">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-0D651924-83DC-4FB8-ACE1-83A5FEA3648C" name="通过" sourceRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D" targetRef="sid-DEDBD6B6-5348-494A-A212-18A171193232">
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-        </sequenceFlow>
-        <sequenceFlow id="sid-37BD7150-CF5D-4AA6-982D-B305AE720F99" sourceRef="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" targetRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D">
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-        </sequenceFlow>
         <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-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" sourceRef="sid-D5765623-E20C-4774-9303-488697382FC8" targetRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE">
-            <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>
@@ -74,11 +65,6 @@
         <sequenceFlow id="sid-2F6390F0-B470-4949-965D-F95510CF8844" name="通过不交费" sourceRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" targetRef="sid-C633703C-7627-495A-AFDA-0CE56BDF3BD0">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" sourceRef="sid-DEDBD6B6-5348-494A-A212-18A171193232" targetRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635">
-            <extensionElements>
-                <activiti:executionListener event="start" delegateExpression="${annualCheckNeedPayService}"></activiti:executionListener>
-            </extensionElements>
-        </sequenceFlow>
         <sequenceFlow id="sid-1E9A7C43-FEF5-4D45-A307-0430AA71DB12" name="企业用户提交" sourceRef="sid-9A4454BD-9A0F-4B81-B482-BA2179020366" targetRef="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
@@ -118,6 +104,16 @@
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
         <sequenceFlow id="sid-61B018D5-F555-4470-9A3E-28B98071D345" sourceRef="sid-71327AD9-FADC-4CE8-8F11-372572FCB9DD" targetRef="sid-9A4454BD-9A0F-4B81-B482-BA2179020366"></sequenceFlow>
+        <sequenceFlow id="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" sourceRef="sid-D5765623-E20C-4774-9303-488697382FC8" targetRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></sequenceFlow>
+        <sequenceFlow id="sid-37BD7150-CF5D-4AA6-982D-B305AE720F99" sourceRef="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" targetRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D"></sequenceFlow>
+        <sequenceFlow id="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" sourceRef="sid-DEDBD6B6-5348-494A-A212-18A171193232" targetRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${annualCheckNeedPayService}"></activiti:executionListener>
+            </extensionElements>
+        </sequenceFlow>
+        <sequenceFlow id="sid-0D651924-83DC-4FB8-ACE1-83A5FEA3648C" name="通过" sourceRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D" targetRef="sid-DEDBD6B6-5348-494A-A212-18A171193232">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_audit_apply">
         <bpmndi:BPMNPlane bpmnElement="oil_audit_apply" id="BPMNPlane_oil_audit_apply">
@@ -226,14 +222,14 @@
                 <omgdi:waypoint x="1362.0" y="178.44642857142878"></omgdi:waypoint>
                 <omgdi:waypoint x="1410.000558002352" y="178.87500498216392"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" id="BPMNEdge_sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46">
-                <omgdi:waypoint x="565.0" y="178.23696682464498"></omgdi:waypoint>
-                <omgdi:waypoint x="600.4047619047619" y="178.40476190476232"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-F79F4B30-54D3-445C-8761-786B5151F0DC" id="BPMNEdge_sid-F79F4B30-54D3-445C-8761-786B5151F0DC">
                 <omgdi:waypoint x="29.999250056245316" y="178.14999250056277"></omgdi:waypoint>
                 <omgdi:waypoint x="65.0" y="178.5000000000002"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" id="BPMNEdge_sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46">
+                <omgdi:waypoint x="565.0" y="178.23696682464498"></omgdi:waypoint>
+                <omgdi:waypoint x="600.4047619047619" y="178.40476190476232"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D8EF8E5C-09F6-447F-8D74-3487CC461350" id="BPMNEdge_sid-D8EF8E5C-09F6-447F-8D74-3487CC461350">
                 <omgdi:waypoint x="415.0" y="178.0000000000004"></omgdi:waypoint>
                 <omgdi:waypoint x="465.0" y="178.0000000000004"></omgdi:waypoint>