Bladeren bron

市场管理:专业处室提交日常评价流程fix

baichengfei 4 jaren geleden
bovenliggende
commit
ae76b5b349
1 gewijzigde bestanden met toevoegingen van 13 en 13 verwijderingen
  1. 13 13
      src/main/resources/processes/oil_daily_contract_eva_by_business.bpmn20.xml

+ 13 - 13
src/main/resources/processes/oil_daily_contract_eva_by_business.bpmn20.xml

@@ -23,7 +23,7 @@
         <sequenceFlow id="sid-DE0F7BD6-366E-4F25-BC55-32E20E0E87B2" sourceRef="startEvent1" targetRef="sid-9EF255A9-52B1-4287-8B53-0FB1D4A7C440"></sequenceFlow>
         <userTask id="sid-DACC03AA-AFA8-4413-B45D-C091829081F3" name="审批未通过" activiti:candidateUsers="${users}">
             <extensionElements>
-                <activiti:taskListener event="create" delegateExpression="${evaluateApprovalRefuseTaskService}"></activiti:taskListener>
+                <activiti:taskListener event="create" delegateExpression="${evaApprovalByBusinessRefuseTaskService}"></activiti:taskListener>
             </extensionElements>
         </userTask>
         <exclusiveGateway id="sid-BEFC66DD-132F-4177-A66B-63D5CED8E569"></exclusiveGateway>
@@ -32,16 +32,6 @@
         <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-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="${evaApprovalByBusRefuseService}">
-                    <activiti:field name="stepCode">
-                        <activiti:string><![CDATA[-9]]></activiti:string>
-                    </activiti:field>
-                </activiti:executionListener>
-            </extensionElements>
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-        </sequenceFlow>
         <sequenceFlow id="sid-D7E91776-67E4-4AEB-9A94-6BCC3940579F" sourceRef="sid-E04E3408-E2BB-4EC6-B98E-F80BE1108543" targetRef="sid-BEFC66DD-132F-4177-A66B-63D5CED8E569"></sequenceFlow>
         <sequenceFlow id="sid-3EA50621-CC29-4D35-9034-97814B400470" sourceRef="sid-C538D2C1-20B5-4A37-9315-4F2144AA4947" targetRef="sid-9A2D0670-8225-4F2B-9FB3-2B87DD502A43"></sequenceFlow>
         <sequenceFlow id="sid-5F2A768D-E979-4EA6-967D-3096F4E47819" sourceRef="sid-9A2D0670-8225-4F2B-9FB3-2B87DD502A43" targetRef="sid-8E07F48B-65B2-4541-A150-230589C7F95C"></sequenceFlow>
@@ -51,10 +41,9 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-9CFA6746-2F45-4937-819D-3C3812A73CBA" sourceRef="sid-DACC03AA-AFA8-4413-B45D-C091829081F3" targetRef="sid-C538D2C1-20B5-4A37-9315-4F2144AA4947"></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="${evaApprovalByBusRefuseService}">
+                <activiti:executionListener event="start" delegateExpression="${evaApprovalByBusinessRefuseService}">
                     <activiti:field name="stepCode">
                         <activiti:string><![CDATA[-4]]></activiti:string>
                     </activiti:field>
@@ -62,6 +51,17 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </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="${evaApprovalByBusinessRefuseService}">
+                    <activiti:field name="stepCode">
+                        <activiti:string><![CDATA[-9]]></activiti:string>
+                    </activiti:field>
+                </activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-9CFA6746-2F45-4937-819D-3C3812A73CBA" sourceRef="sid-DACC03AA-AFA8-4413-B45D-C091829081F3" targetRef="sid-C538D2C1-20B5-4A37-9315-4F2144AA4947"></sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_daily_contract_eva_by_business">
         <bpmndi:BPMNPlane bpmnElement="oil_daily_contract_eva_by_business" id="BPMNPlane_oil_daily_contract_eva_by_business">