合同日常评审通过 通

src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateWorkflowEndService.java

@@ -9,13 +9,13 @@ import org.activiti.engine.delegate.TaskListener;
 import org.springframework.stereotype.Component;
 
 @Component("evaluateWorkflowEndService")
-public class EvaluateWorkflowEndService implements TaskListener {
+public class EvaluateWorkflowEndService implements ExecutionListener {
     // 企业法规处审批入库完成
     @Override
-    public void notify(DelegateTask delegateTask) {
-        String callbackUrl = delegateTask.getVariable("callbackUrl").toString();
+    public void notify(DelegateExecution delegateExecution) {
+        String callbackUrl = delegateExecution.getVariable("callbackUrl").toString();
         // String processKey = delegateTask.getVariable("processKey").toString();
-        String businessKey = delegateTask.getVariable("businessKey").toString();
+        String businessKey = delegateExecution.getVariable("businessKey").toString();
 
         String approveUrl = callbackUrl + "/contract-daily-listener/workflow-end";
 

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

@@ -79,9 +79,6 @@
             </extensionElements>
             <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
         </sequenceFlow>
-        <sequenceFlow id="sid-3CA7D770-9CB1-4506-B7E6-CD9B2793A192" sourceRef="sid-BEFC66DD-132F-4177-A66B-63D5CED8E569" targetRef="sid-B04F4DC7-A903-4B14-9A50-2DF73371D021">
-            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></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>
@@ -105,6 +102,12 @@
         <sequenceFlow id="sid-936CB097-C571-4CCC-A87A-2BA9E81A3D21" sourceRef="sid-9EF255A9-52B1-4287-8B53-0FB1D4A7C440" targetRef="sid-C538D2C1-20B5-4A37-9315-4F2144AA4947"></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-898C6AF6-1DE5-4121-9FD9-9494A85182F5" sourceRef="sid-C538D2C1-20B5-4A37-9315-4F2144AA4947" targetRef="sid-C4B210EC-9A8C-4E24-823D-6178DF80C1E3"></sequenceFlow>
+        <sequenceFlow id="sid-3CA7D770-9CB1-4506-B7E6-CD9B2793A192" sourceRef="sid-BEFC66DD-132F-4177-A66B-63D5CED8E569" targetRef="sid-B04F4DC7-A903-4B14-9A50-2DF73371D021">
+            <extensionElements>
+                <activiti:executionListener event="start" delegateExpression="${evaluateWorkflowEndService}"></activiti:executionListener>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+        </sequenceFlow>
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_oil_daily_contract_evaluation">
         <bpmndi:BPMNPlane bpmnElement="oil_daily_contract_evaluation" id="BPMNPlane_oil_daily_contract_evaluation">
@@ -188,14 +191,14 @@
                 <omgdi:waypoint x="775.5" y="295.0"></omgdi:waypoint>
                 <omgdi:waypoint x="365.0" y="295.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>
-            </bpmndi:BPMNEdge>
             <bpmndi:BPMNEdge bpmnElement="sid-9CFA6746-2F45-4937-819D-3C3812A73CBA" id="BPMNEdge_sid-9CFA6746-2F45-4937-819D-3C3812A73CBA">
                 <omgdi:waypoint x="315.0" y="255.0"></omgdi:waypoint>
                 <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>
+            </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>