2
1
lining vor 6 Jahren
Ursprung
Commit
a2f7cef7f4

+ 12 - 16
src/main/resources/processes/oil_append_apply.bpmn20.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
-  <process id="oil_supplier_apply" name="oil_supplier_apply" isExecutable="true">
-    <documentation>供方准入、增项业务流程图</documentation>
+  <process id="oil_append_apply" name="oil_append_apply" isExecutable="true">
+    <documentation>增项业务流程图</documentation>
     <startEvent id="startEvent1"></startEvent>
     <userTask id="sid-F5587778-2194-43BD-B5A9-23041685B24E" name="供方申请" activiti:assignee="${recorder}">
       <extensionElements>
@@ -10,11 +10,7 @@
     </userTask>
     <sequenceFlow id="sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52" sourceRef="startEvent1" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E"></sequenceFlow>
     <exclusiveGateway id="sid-9066F48C-509C-4652-B697-A7F0E400D57A"></exclusiveGateway>
-    <userTask id="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159" name="集 中 评 审" activiti:assignee="${users}">
-      <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
-      </extensionElements>
-    </userTask>
+    <userTask id="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159" name="集 中 评 审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389"></exclusiveGateway>
     <sequenceFlow id="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" sourceRef="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159" targetRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389"></sequenceFlow>
     <endEvent id="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19" name="通过"></endEvent>
@@ -34,7 +30,7 @@
     <sequenceFlow id="sid-E597E34E-856D-4D6B-A0D0-E7B5E4B84EA8" sourceRef="sid-93350F57-2C3C-4BE5-B86B-16F674908E36" targetRef="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9"></sequenceFlow>
     <exclusiveGateway id="sid-225C5747-6CFC-41AB-B244-65B397205F62"></exclusiveGateway>
     <sequenceFlow id="sid-C2AD6A34-7DF1-4265-A861-851823391728" sourceRef="sid-A65020CD-7F8C-4987-8428-8F3309FFFB04" targetRef="sid-225C5747-6CFC-41AB-B244-65B397205F62"></sequenceFlow>
-    <userTask id="sid-32991EA5-8FB3-47F6-82F7-349BEA73C5A9" name="业务处室接收"></userTask>
+    <userTask id="sid-32991EA5-8FB3-47F6-82F7-349BEA73C5A9" name="业务处室接收" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-FA266D72-9AD1-4F62-9B22-AAAE1CDC1867" sourceRef="sid-32991EA5-8FB3-47F6-82F7-349BEA73C5A9" targetRef="sid-A65020CD-7F8C-4987-8428-8F3309FFFB04"></sequenceFlow>
     <sequenceFlow id="sid-72FD9AD3-D8DA-4EDA-8CDA-61CA2EF18D16" name="通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-93350F57-2C3C-4BE5-B86B-16F674908E36">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
@@ -55,8 +51,8 @@
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
   </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_oil_supplier_apply">
-    <bpmndi:BPMNPlane bpmnElement="oil_supplier_apply" id="BPMNPlane_oil_supplier_apply">
+  <bpmndi:BPMNDiagram id="BPMNDiagram_oil_append_apply">
+    <bpmndi:BPMNPlane bpmnElement="oil_append_apply" id="BPMNPlane_oil_append_apply">
       <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
         <omgdc:Bounds height="30.0" width="30.0" x="20.000000000000007" y="160.00000000000014"></omgdc:Bounds>
       </bpmndi:BPMNShape>
@@ -82,7 +78,7 @@
         <omgdc:Bounds height="30.0" width="30.0" x="1100.0000000000005" y="225.0000000000001"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-05616824-0C38-43E9-BB40-D29437C7CD53" id="BPMNShape_sid-05616824-0C38-43E9-BB40-D29437C7CD53">
-        <omgdc:Bounds height="80.0" width="99.99999999999997" x="210.00000000000003" y="135.00000000000006"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="99.99999999999997" x="210.00000000000003" y="135.00000000000003"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-93350F57-2C3C-4BE5-B86B-16F674908E36" id="BPMNShape_sid-93350F57-2C3C-4BE5-B86B-16F674908E36">
         <omgdc:Bounds height="80.0" width="99.99999999999994" x="420.00000000000006" y="135.00000000000006"></omgdc:Bounds>
@@ -94,11 +90,11 @@
         <omgdc:Bounds height="40.0" width="40.0" x="885.0000000000001" y="155.00000000000023"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-32991EA5-8FB3-47F6-82F7-349BEA73C5A9" id="BPMNShape_sid-32991EA5-8FB3-47F6-82F7-349BEA73C5A9">
-        <omgdc:Bounds height="80.0" width="100.0" x="630.0000000000001" y="135.00000000000006"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="630.0000000000001" y="135.00000000000003"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-F3AF7B94-E5FC-4B9F-941D-120CAFE945F4" id="BPMNEdge_sid-F3AF7B94-E5FC-4B9F-941D-120CAFE945F4">
-        <omgdi:waypoint x="190.0" y="175.00000000000006"></omgdi:waypoint>
-        <omgdi:waypoint x="210.00000000000003" y="175.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="190.0" y="175.00000000000003"></omgdi:waypoint>
+        <omgdi:waypoint x="210.00000000000003" y="175.00000000000003"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" id="BPMNEdge_sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54">
         <omgdi:waypoint x="1133.830985915493" y="176.16901408450715"></omgdi:waypoint>
@@ -109,7 +105,7 @@
         <omgdi:waypoint x="420.00000000000006" y="175.23923444976083"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754" id="BPMNEdge_sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754">
-        <omgdi:waypoint x="310.0" y="175.00884955752218"></omgdi:waypoint>
+        <omgdi:waypoint x="310.0" y="175.00884955752215"></omgdi:waypoint>
         <omgdi:waypoint x="345.3214285714286" y="175.3214285714286"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E597E34E-856D-4D6B-A0D0-E7B5E4B84EA8" id="BPMNEdge_sid-E597E34E-856D-4D6B-A0D0-E7B5E4B84EA8">
@@ -156,7 +152,7 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EB076F5D-4399-4588-8EB7-170C1B7A7988" id="BPMNEdge_sid-EB076F5D-4399-4588-8EB7-170C1B7A7988">
         <omgdi:waypoint x="594.5913461538463" y="175.40865384615398"></omgdi:waypoint>
-        <omgdi:waypoint x="630.0000000000001" y="175.2392344497609"></omgdi:waypoint>
+        <omgdi:waypoint x="630.0000000000001" y="175.23923444976086"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-910CEAE5-37F6-42A7-A4E1-4E2D6D2C2149" id="BPMNEdge_sid-910CEAE5-37F6-42A7-A4E1-4E2D6D2C2149">
         <omgdi:waypoint x="924.5913461538463" y="175.40865384615404"></omgdi:waypoint>

+ 6 - 6
src/main/resources/processes/oil_audit_apply.bpmn20.xml

@@ -27,7 +27,7 @@
     <sequenceFlow id="sid-B68E8B23-15DA-47EB-837B-9830D40B9696" sourceRef="sid-83F82DD8-F857-4908-9A4C-6C62A42F5207" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <userTask id="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" name="业务处室接收"></userTask>
+    <userTask id="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" name="业务处室接收" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-D41C626E-114D-42A3-A121-9FE3A9F16096" sourceRef="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" targetRef="sid-DA1BD531-293F-4233-8F81-E929521E498E"></sequenceFlow>
     <sequenceFlow id="sid-E8D1F6DC-4AE2-413C-84CC-F3A4591CAE8A" name="通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
@@ -48,7 +48,7 @@
         <omgdc:Bounds height="28.0" width="28.0" x="825.0000000000002" y="161.00000000000009"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-32EE47FB-8A0C-4052-B073-347747A2413C" id="BPMNShape_sid-32EE47FB-8A0C-4052-B073-347747A2413C">
-        <omgdc:Bounds height="29.99999999999997" width="30.0" x="740.0000000000003" y="225.00000000000003"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="740.0000000000003" y="225.00000000000003"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D5765623-E20C-4774-9303-488697382FC8" id="BPMNShape_sid-D5765623-E20C-4774-9303-488697382FC8">
         <omgdc:Bounds height="80.0" width="99.99999999999997" x="240.00000000000003" y="138.00000000000017"></omgdc:Bounds>
@@ -60,7 +60,7 @@
         <omgdc:Bounds height="80.0" width="120.99999999999989" x="585.0000000000001" y="138.00000000000026"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" id="BPMNShape_sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956">
-        <omgdc:Bounds height="80.0" width="99.99999999999994" x="450.00000000000006" y="138.00000000000023"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="99.99999999999994" x="450.00000000000006" y="138.00000000000028"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-6859CEC6-ACF1-44CD-9F6D-E2A069698817" id="BPMNEdge_sid-6859CEC6-ACF1-44CD-9F6D-E2A069698817">
         <omgdi:waypoint x="706.0" y="177.94034707158374"></omgdi:waypoint>
@@ -77,7 +77,7 @@
         <omgdi:waypoint x="825.0002509882665" y="175.08383083240568"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E8D1F6DC-4AE2-413C-84CC-F3A4591CAE8A" id="BPMNEdge_sid-E8D1F6DC-4AE2-413C-84CC-F3A4591CAE8A">
-        <omgdi:waypoint x="414.59134615384625" y="178.40865384615404"></omgdi:waypoint>
+        <omgdi:waypoint x="414.59134615384625" y="178.40865384615407"></omgdi:waypoint>
         <omgdi:waypoint x="450.00000000000006" y="178.239234449761"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" id="BPMNEdge_sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46">
@@ -89,8 +89,8 @@
         <omgdi:waypoint x="95.0" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-D41C626E-114D-42A3-A121-9FE3A9F16096" id="BPMNEdge_sid-D41C626E-114D-42A3-A121-9FE3A9F16096">
-        <omgdi:waypoint x="550.0" y="178.00000000000023"></omgdi:waypoint>
-        <omgdi:waypoint x="585.0000000000001" y="178.00000000000026"></omgdi:waypoint>
+        <omgdi:waypoint x="550.0" y="178.00000000000028"></omgdi:waypoint>
+        <omgdi:waypoint x="585.0000000000001" y="178.00000000000028"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-BCE3633B-A666-47A5-A005-216CF9EBBA95" id="BPMNEdge_sid-BCE3633B-A666-47A5-A005-216CF9EBBA95">
         <omgdi:waypoint x="195.0" y="178.00000000000006"></omgdi:waypoint>

+ 2 - 2
src/main/resources/processes/oil_supplier_apply_1.bpmn20.xml

@@ -43,11 +43,11 @@
     <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <userTask id="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" name="业务处室接收"></userTask>
-    <sequenceFlow id="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></sequenceFlow>
+    <userTask id="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" name="业务处室接收" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_supplier_apply_1">
     <bpmndi:BPMNPlane bpmnElement="oil_supplier_apply_1" id="BPMNPlane_oil_supplier_apply_1">