市场管理：日常评价专业处室分办环节可退回

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

@@ -48,7 +48,6 @@
         <sequenceFlow id="sid-D7E91776-67E4-4AEB-9A94-6BCC3940579F" sourceRef="sid-E04E3408-E2BB-4EC6-B98E-F80BE1108543" targetRef="sid-BEFC66DD-132F-4177-A66B-63D5CED8E569"></sequenceFlow>
         <endEvent id="sid-B04F4DC7-A903-4B14-9A50-2DF73371D021"></endEvent>
         <sequenceFlow id="sid-82ED82B2-70D5-4451-8947-19ECE964186E" sourceRef="sid-0546DD7D-1209-4A32-8DBE-2FCAABAFDE36" targetRef="sid-50F2D5C6-151E-473E-924F-C3870F97471A"></sequenceFlow>
-        <sequenceFlow id="sid-4A8162DB-FC76-4EEB-9ED1-2F6C34BB955F" sourceRef="sid-F69982A0-3F90-4A87-9951-F2CFA8FBE989" targetRef="sid-9A2D0670-8225-4F2B-9FB3-2B87DD502A43"></sequenceFlow>
         <sequenceFlow id="sid-1BB01316-967A-4EE7-BCCB-C228297E1C3A" sourceRef="sid-BEFC66DD-132F-4177-A66B-63D5CED8E569" targetRef="sid-DACC03AA-AFA8-4413-B45D-C091829081F3">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${evaluateApprovalRefuseService}">
@@ -59,16 +58,6 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-7C2671DD-3ED3-4954-9624-8CAB37D93B9F" sourceRef="sid-8E07F48B-65B2-4541-A150-230589C7F95C" targetRef="sid-DACC03AA-AFA8-4413-B45D-C091829081F3">
-            <extensionElements>
-                <activiti:executionListener event="start" delegateExpression="${evaluateApprovalRefuseService}">
-                    <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-0B8C208F-2626-4C00-8D76-7281BE3C5AFF" sourceRef="sid-50F2D5C6-151E-473E-924F-C3870F97471A" targetRef="sid-DACC03AA-AFA8-4413-B45D-C091829081F3">
             <extensionElements>
                 <activiti:executionListener event="start" delegateExpression="${evaluateApprovalRefuseService}">
@@ -79,9 +68,6 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-D6C4C528-F1E9-44DD-9571-AA9A4F62295B" sourceRef="sid-8E07F48B-65B2-4541-A150-230589C7F95C" targetRef="sid-E04E3408-E2BB-4EC6-B98E-F80BE1108543">
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-        </sequenceFlow>
         <sequenceFlow id="sid-EF9E7048-6BF1-4AD1-8B6B-59F1B628B09D" sourceRef="sid-50F2D5C6-151E-473E-924F-C3870F97471A" targetRef="sid-F69982A0-3F90-4A87-9951-F2CFA8FBE989">
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
@@ -108,6 +94,34 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
+        <exclusiveGateway id="sid-60805C87-4345-484E-B8B5-372EC3243C2B"></exclusiveGateway>
+        <sequenceFlow id="sid-5B879887-1160-4787-856C-915283D77C44" sourceRef="sid-F69982A0-3F90-4A87-9951-F2CFA8FBE989" targetRef="sid-60805C87-4345-484E-B8B5-372EC3243C2B"></sequenceFlow>
+        <sequenceFlow id="sid-D6C4C528-F1E9-44DD-9571-AA9A4F62295B" sourceRef="sid-8E07F48B-65B2-4541-A150-230589C7F95C" targetRef="sid-E04E3408-E2BB-4EC6-B98E-F80BE1108543">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-0ABEBE08-3554-4C26-A9A2-3852325F16DA" sourceRef="sid-60805C87-4345-484E-B8B5-372EC3243C2B" targetRef="sid-9A2D0670-8225-4F2B-9FB3-2B87DD502A43">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-7C2671DD-3ED3-4954-9624-8CAB37D93B9F" sourceRef="sid-8E07F48B-65B2-4541-A150-230589C7F95C" targetRef="sid-DACC03AA-AFA8-4413-B45D-C091829081F3">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${evaluateApprovalRefuseService}">
+                    <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-42F12172-A803-4B46-9B13-0B0C10BDCCD8" sourceRef="sid-60805C87-4345-484E-B8B5-372EC3243C2B" targetRef="sid-DACC03AA-AFA8-4413-B45D-C091829081F3">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${evaluateApprovalRefuseService}">
+                    <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_daily_contract_evaluation">
         <bpmndi:BPMNPlane bpmnElement="oil_daily_contract_evaluation" id="BPMNPlane_oil_daily_contract_evaluation">
@@ -133,13 +147,13 @@
                 <omgdc:Bounds height="80.0" width="100.0" x="840.0" y="138.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-9A2D0670-8225-4F2B-9FB3-2B87DD502A43" id="BPMNShape_sid-9A2D0670-8225-4F2B-9FB3-2B87DD502A43">
-                <omgdc:Bounds height="80.0" width="100.0" x="985.0" y="138.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1065.0" y="138.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-8E07F48B-65B2-4541-A150-230589C7F95C" id="BPMNShape_sid-8E07F48B-65B2-4541-A150-230589C7F95C">
-                <omgdc:Bounds height="40.0" width="40.0" x="1130.0" y="158.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1210.0" y="158.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-E04E3408-E2BB-4EC6-B98E-F80BE1108543" id="BPMNShape_sid-E04E3408-E2BB-4EC6-B98E-F80BE1108543">
-                <omgdc:Bounds height="80.0" width="100.0" x="1215.0" y="138.0"></omgdc:Bounds>
+                <omgdc:Bounds height="80.0" width="100.0" x="1295.0" y="138.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-9EF255A9-52B1-4287-8B53-0FB1D4A7C440" id="BPMNShape_sid-9EF255A9-52B1-4287-8B53-0FB1D4A7C440">
                 <omgdc:Bounds height="80.0" width="100.0" x="155.0" y="138.0"></omgdc:Bounds>
@@ -148,10 +162,13 @@
                 <omgdc:Bounds height="80.0" width="100.0" x="265.0" y="255.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-BEFC66DD-132F-4177-A66B-63D5CED8E569" id="BPMNShape_sid-BEFC66DD-132F-4177-A66B-63D5CED8E569">
-                <omgdc:Bounds height="40.0" width="40.0" x="1360.0" y="158.0"></omgdc:Bounds>
+                <omgdc:Bounds height="40.0" width="40.0" x="1440.0" y="158.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNShape bpmnElement="sid-B04F4DC7-A903-4B14-9A50-2DF73371D021" id="BPMNShape_sid-B04F4DC7-A903-4B14-9A50-2DF73371D021">
-                <omgdc:Bounds height="28.0" width="28.0" x="1445.0" y="164.0"></omgdc:Bounds>
+                <omgdc:Bounds height="28.0" width="28.0" x="1525.0" y="164.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-60805C87-4345-484E-B8B5-372EC3243C2B" id="BPMNShape_sid-60805C87-4345-484E-B8B5-372EC3243C2B">
+                <omgdc:Bounds height="40.0" width="40.0" x="985.0" y="158.0"></omgdc:Bounds>
             </bpmndi:BPMNShape>
             <bpmndi:BPMNEdge bpmnElement="sid-AD7B8834-3457-4C02-B2CE-BFABA169F94B" id="BPMNEdge_sid-AD7B8834-3457-4C02-B2CE-BFABA169F94B">
                 <omgdi:waypoint x="545.5" y="197.5"></omgdi:waypoint>
@@ -162,10 +179,19 @@
                 <omgdi:waypoint x="110.0" y="178.0"></omgdi:waypoint>
                 <omgdi:waypoint x="155.0" y="178.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-42F12172-A803-4B46-9B13-0B0C10BDCCD8" id="BPMNEdge_sid-42F12172-A803-4B46-9B13-0B0C10BDCCD8">
+                <omgdi:waypoint x="1005.5" y="197.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1005.5" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="365.0" y="295.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-936CB097-C571-4CCC-A87A-2BA9E81A3D21" id="BPMNEdge_sid-936CB097-C571-4CCC-A87A-2BA9E81A3D21">
                 <omgdi:waypoint x="255.0" y="178.5"></omgdi:waypoint>
                 <omgdi:waypoint x="295.5" y="178.5"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-5B879887-1160-4787-856C-915283D77C44" id="BPMNEdge_sid-5B879887-1160-4787-856C-915283D77C44">
+                <omgdi:waypoint x="940.0" y="178.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="985.4130434782609" y="178.41304347826087"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-EF9E7048-6BF1-4AD1-8B6B-59F1B628B09D" id="BPMNEdge_sid-EF9E7048-6BF1-4AD1-8B6B-59F1B628B09D">
                 <omgdi:waypoint x="794.5833333333334" y="178.41666666666666"></omgdi:waypoint>
                 <omgdi:waypoint x="840.0" y="178.2183406113537"></omgdi:waypoint>
@@ -174,17 +200,13 @@
                 <omgdi:waypoint x="334.5833333333333" y="178.41666666666666"></omgdi:waypoint>
                 <omgdi:waypoint x="380.0" y="178.2183406113537"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge bpmnElement="sid-4A8162DB-FC76-4EEB-9ED1-2F6C34BB955F" id="BPMNEdge_sid-4A8162DB-FC76-4EEB-9ED1-2F6C34BB955F">
-                <omgdi:waypoint x="940.0" y="178.0"></omgdi:waypoint>
-                <omgdi:waypoint x="985.0" y="178.0"></omgdi:waypoint>
-            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-656BD5B2-E542-4CC9-8F0A-6E20E9DC7941" id="BPMNEdge_sid-656BD5B2-E542-4CC9-8F0A-6E20E9DC7941">
                 <omgdi:waypoint x="564.5833333333334" y="178.41666666666666"></omgdi:waypoint>
                 <omgdi:waypoint x="610.0" y="178.2183406113537"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D6C4C528-F1E9-44DD-9571-AA9A4F62295B" id="BPMNEdge_sid-D6C4C528-F1E9-44DD-9571-AA9A4F62295B">
-                <omgdi:waypoint x="1169.5833333333333" y="178.41666666666666"></omgdi:waypoint>
-                <omgdi:waypoint x="1215.0" y="178.2183406113537"></omgdi:waypoint>
+                <omgdi:waypoint x="1249.5833333333333" y="178.41666666666666"></omgdi:waypoint>
+                <omgdi:waypoint x="1295.0" y="178.2183406113537"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-0B8C208F-2626-4C00-8D76-7281BE3C5AFF" id="BPMNEdge_sid-0B8C208F-2626-4C00-8D76-7281BE3C5AFF">
                 <omgdi:waypoint x="775.5" y="197.5"></omgdi:waypoint>
@@ -196,12 +218,16 @@
                 <omgdi:waypoint x="315.0" y="198.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-3CA7D770-9CB1-4506-B7E6-CD9B2793A192" id="BPMNEdge_sid-3CA7D770-9CB1-4506-B7E6-CD9B2793A192">
-                <omgdi:waypoint x="1399.621794871795" y="178.37820512820514"></omgdi:waypoint>
-                <omgdi:waypoint x="1445.0002839785393" y="178.0891701657418"></omgdi:waypoint>
+                <omgdi:waypoint x="1479.621794871795" y="178.37820512820514"></omgdi:waypoint>
+                <omgdi:waypoint x="1525.0002839785393" y="178.0891701657418"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-0ABEBE08-3554-4C26-A9A2-3852325F16DA" id="BPMNEdge_sid-0ABEBE08-3554-4C26-A9A2-3852325F16DA">
+                <omgdi:waypoint x="1024.5871559633028" y="178.41284403669724"></omgdi:waypoint>
+                <omgdi:waypoint x="1065.0" y="178.2283105022831"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-7C2671DD-3ED3-4954-9624-8CAB37D93B9F" id="BPMNEdge_sid-7C2671DD-3ED3-4954-9624-8CAB37D93B9F">
-                <omgdi:waypoint x="1150.5" y="197.5"></omgdi:waypoint>
-                <omgdi:waypoint x="1150.5" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1230.5" y="197.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1230.5" y="295.0"></omgdi:waypoint>
                 <omgdi:waypoint x="365.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-EDD9B2DF-3DAE-43D5-8B21-BEFFAF39DCFA" id="BPMNEdge_sid-EDD9B2DF-3DAE-43D5-8B21-BEFFAF39DCFA">
@@ -209,20 +235,20 @@
                 <omgdi:waypoint x="525.4130434782609" y="178.41304347826087"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-5F2A768D-E979-4EA6-967D-3096F4E47819" id="BPMNEdge_sid-5F2A768D-E979-4EA6-967D-3096F4E47819">
-                <omgdi:waypoint x="1085.0" y="178.2164502164502"></omgdi:waypoint>
-                <omgdi:waypoint x="1130.4130434782608" y="178.41304347826087"></omgdi:waypoint>
+                <omgdi:waypoint x="1165.0" y="178.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="1210.4130434782608" y="178.41304347826087"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-D7E91776-67E4-4AEB-9A94-6BCC3940579F" id="BPMNEdge_sid-D7E91776-67E4-4AEB-9A94-6BCC3940579F">
-                <omgdi:waypoint x="1315.0" y="178.2164502164502"></omgdi:waypoint>
-                <omgdi:waypoint x="1360.4130434782608" y="178.41304347826087"></omgdi:waypoint>
+                <omgdi:waypoint x="1395.0" y="178.2164502164502"></omgdi:waypoint>
+                <omgdi:waypoint x="1440.4130434782608" y="178.41304347826087"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-82ED82B2-70D5-4451-8947-19ECE964186E" id="BPMNEdge_sid-82ED82B2-70D5-4451-8947-19ECE964186E">
                 <omgdi:waypoint x="710.0" y="178.2164502164502"></omgdi:waypoint>
                 <omgdi:waypoint x="755.4130434782609" y="178.41304347826087"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-1BB01316-967A-4EE7-BCCB-C228297E1C3A" id="BPMNEdge_sid-1BB01316-967A-4EE7-BCCB-C228297E1C3A">
-                <omgdi:waypoint x="1380.5" y="197.5"></omgdi:waypoint>
-                <omgdi:waypoint x="1380.5" y="295.0"></omgdi:waypoint>
+                <omgdi:waypoint x="1460.5" y="197.5"></omgdi:waypoint>
+                <omgdi:waypoint x="1460.5" y="295.0"></omgdi:waypoint>
                 <omgdi:waypoint x="365.0" y="295.0"></omgdi:waypoint>
             </bpmndi:BPMNEdge>
         </bpmndi:BPMNPlane>