工作流

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

@@ -12,18 +12,20 @@
     <userTask id="sid-F067FA1C-2CD1-4F76-9C1C-D8CDA1D8E08F" name="二级单位初审">
       <extensionElements>
         <activiti:taskListener event="create" class="com.common.workflow.service.activiti.custom.MyAssignmentHandler"></activiti:taskListener>
+        <activiti:taskListener event="complete" class="com.common.workflow.service.activiti.custom.TaskCompleteCallbackListener"></activiti:taskListener>
       </extensionElements>
       <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
-        <completionCondition>${down&gt;1}</completionCondition>
+        <completionCondition>${result == 0}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
     <exclusiveGateway id="sid-9066F48C-509C-4652-B697-A7F0E400D57A"></exclusiveGateway>
     <userTask id="sid-79DD1999-5B8D-48D7-9044-B72F48E7049A" name="二级单位复审">
       <extensionElements>
         <activiti:taskListener event="create" class="com.common.workflow.service.activiti.custom.MyAssignmentHandler"></activiti:taskListener>
+        <activiti:taskListener event="complete" class="com.common.workflow.service.activiti.custom.TaskCompleteCallbackListener"></activiti:taskListener>
       </extensionElements>
       <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
-        <completionCondition>${down&gt;1}</completionCondition>
+        <completionCondition>${result == 0}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
     <userTask id="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159" name="集 中 评 审" activiti:assignee="${users}">
@@ -51,15 +53,9 @@
     </sequenceFlow>
     <exclusiveGateway id="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9"></exclusiveGateway>
     <sequenceFlow id="sid-E597E34E-856D-4D6B-A0D0-E7B5E4B84EA8" sourceRef="sid-79DD1999-5B8D-48D7-9044-B72F48E7049A" targetRef="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9"></sequenceFlow>
-    <sequenceFlow id="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-79DD1999-5B8D-48D7-9044-B72F48E7049A">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-10C6E702-BDDC-4DA7-B8A4-28640B8D5B82" sourceRef="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9" targetRef="sid-BE93925F-6E3F-4C58-B8CB-C00F2140AF1D">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-6C9050FE-9203-4F9C-9C49-1B445A9D6286" sourceRef="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
@@ -71,6 +67,14 @@
     <sequenceFlow id="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-10C6E702-BDDC-4DA7-B8A4-28640B8D5B82" sourceRef="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9" targetRef="sid-BE93925F-6E3F-4C58-B8CB-C00F2140AF1D">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <textAnnotation id="sid-69CBA76A-89EC-4AFD-B8BE-632F0F5AA9E9"></textAnnotation>
+    <association id="sid-BD6A35DA-58FA-4204-B385-DED982EF5324" sourceRef="sid-79DD1999-5B8D-48D7-9044-B72F48E7049A" targetRef="sid-69CBA76A-89EC-4AFD-B8BE-632F0F5AA9E9" associationDirection="None"></association>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_supplier_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_supplier_apply" id="BPMNPlane_oil_supplier_apply">
@@ -110,6 +114,12 @@
       <bpmndi:BPMNShape bpmnElement="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F" id="BPMNShape_sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
         <omgdc:Bounds height="30.0" width="30.0" x="1230.0" y="230.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-69CBA76A-89EC-4AFD-B8BE-632F0F5AA9E9" id="BPMNShape_sid-69CBA76A-89EC-4AFD-B8BE-632F0F5AA9E9">
+        <omgdc:Bounds height="50.0" width="100.0" x="809.0" y="153.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-BD6A35DA-58FA-4204-B385-DED982EF5324" id="BPMNShape_sid-BD6A35DA-58FA-4204-B385-DED982EF5324">
+        <omgdc:Bounds height="0.39596369360521066" width="43.753988143374954" x="764.3827715533125" y="177.0168619031974"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" id="BPMNEdge_sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54">
         <omgdi:waypoint x="1264.6144578313254" y="178.3855421686747"></omgdi:waypoint>
         <omgdi:waypoint x="1315.0002509882663" y="178.0838308324056"></omgdi:waypoint>
@@ -138,6 +148,10 @@
         <omgdi:waypoint x="145.0" y="248.0"></omgdi:waypoint>
         <omgdi:waypoint x="145.0" y="218.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-BD6A35DA-58FA-4204-B385-DED982EF5324" id="BPMNEdge_sid-BD6A35DA-58FA-4204-B385-DED982EF5324">
+        <omgdi:waypoint x="764.0" y="177.41628959276017"></omgdi:waypoint>
+        <omgdi:waypoint x="809.0" y="177.00904977375566"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" id="BPMNEdge_sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8">
         <omgdi:waypoint x="1180.0" y="178.2164502164502"></omgdi:waypoint>
         <omgdi:waypoint x="1225.4130434782608" y="178.41304347826087"></omgdi:waypoint>
@@ -146,12 +160,6 @@
         <omgdi:waypoint x="848.429889298893" y="178.570110701107"></omgdi:waypoint>
         <omgdi:waypoint x="900.0" y="178.76111111111112"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" id="BPMNEdge_sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB">
-        <omgdi:waypoint x="565.5" y="197.5"></omgdi:waypoint>
-        <omgdi:waypoint x="565.5" y="236.0"></omgdi:waypoint>
-        <omgdi:waypoint x="145.0" y="236.0"></omgdi:waypoint>
-        <omgdi:waypoint x="145.0" y="218.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D" id="BPMNEdge_sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D">
         <omgdi:waypoint x="584.5711610486892" y="178.42883895131087"></omgdi:waypoint>
         <omgdi:waypoint x="635.0" y="178.24067164179104"></omgdi:waypoint>
@@ -160,6 +168,12 @@
         <omgdi:waypoint x="1245.3560606060605" y="197.6439393939394"></omgdi:waypoint>
         <omgdi:waypoint x="1245.1127787671103" y="230.0004239743355"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" id="BPMNEdge_sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB">
+        <omgdi:waypoint x="565.5" y="197.5"></omgdi:waypoint>
+        <omgdi:waypoint x="565.5" y="236.0"></omgdi:waypoint>
+        <omgdi:waypoint x="145.0" y="236.0"></omgdi:waypoint>
+        <omgdi:waypoint x="145.0" y="218.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52" id="BPMNEdge_sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52">
         <omgdi:waypoint x="50.0" y="178.0"></omgdi:waypoint>
         <omgdi:waypoint x="95.0" y="178.0"></omgdi:waypoint>