lining 6 år sedan
förälder
incheckning
78c704295d

+ 1 - 1
src/main/java/com/common/workflow/service/util/Word2Pdf.java

@@ -72,7 +72,7 @@ public class Word2Pdf {
             //lo.setEncoding(Encoding.getUTF8());
             Document doc = new Document(inputStream);// 原始excel路径
             removeWatermark(doc);
-            insertWatermarkText(doc, watermark, 100, 0);
+//            insertWatermarkText(doc, watermark, 100, 0);
             insertWatermarkText(doc, watermark, 300, 0);
             insertWatermarkText(doc, watermark, 550, 0);
 

+ 65 - 47
src/main/resources/processes/oil_audit_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_audit_apply" name="oil_audit_apply" isExecutable="true">
-    <documentation>供方年审流程图</documentation>
+    <documentation>供方年审流程图(分办可退回)</documentation>
     <startEvent id="startEvent1" name="开始"></startEvent>
     <userTask id="sid-F5587778-2194-43BD-B5A9-23041685B24E" name="供方申请" activiti:assignee="${recorder}">
       <extensionElements>
@@ -13,16 +13,9 @@
     <userTask id="sid-D5765623-E20C-4774-9303-488697382FC8" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-BCE3633B-A666-47A5-A005-216CF9EBBA95" sourceRef="sid-F5587778-2194-43BD-B5A9-23041685B24E" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8"></sequenceFlow>
     <exclusiveGateway id="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></exclusiveGateway>
-    <sequenceFlow id="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" sourceRef="sid-D5765623-E20C-4774-9303-488697382FC8" targetRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></sequenceFlow>
     <userTask id="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" name="二级单位复审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-B93E1164-9FAC-4D21-A691-2A4411C35635"></exclusiveGateway>
     <sequenceFlow id="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" sourceRef="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" targetRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635"></sequenceFlow>
-    <sequenceFlow id="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" name="未通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-002682E5-FF90-4A74-8707-0F8B98C09674" name="通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <exclusiveGateway id="sid-9F109B73-35DC-42B6-9B6F-50816C67223E"></exclusiveGateway>
     <sequenceFlow id="sid-BB78E104-5EE5-462C-8332-9774206D19BA" sourceRef="startEvent1" targetRef="sid-9F109B73-35DC-42B6-9B6F-50816C67223E"></sequenceFlow>
     <userTask id="sid-0B124434-FDAD-4E82-91CB-E570A44E7FF3" name="企业用户申请" activiti:assignee="${recorder}">
@@ -32,7 +25,7 @@
     </userTask>
     <userTask id="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-179CD02C-C471-44D4-A64E-82BCEC645FA6" sourceRef="sid-0B124434-FDAD-4E82-91CB-E570A44E7FF3" targetRef="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8"></sequenceFlow>
-    <sequenceFlow id="sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01" sourceRef="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8"></sequenceFlow>
+    <sequenceFlow id="sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01" sourceRef="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8" targetRef="sid-01162014-E410-4093-B0BF-4DC735CE9D7B"></sequenceFlow>
     <sequenceFlow id="sid-284BE3C1-637A-496C-B7B3-CEFB815A8BF2" name="二级单位代办" sourceRef="sid-9F109B73-35DC-42B6-9B6F-50816C67223E" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
@@ -45,6 +38,20 @@
     <sequenceFlow id="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" name="未通过" sourceRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" sourceRef="sid-D5765623-E20C-4774-9303-488697382FC8" targetRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></sequenceFlow>
+    <exclusiveGateway id="sid-01162014-E410-4093-B0BF-4DC735CE9D7B"></exclusiveGateway>
+    <sequenceFlow id="sid-002682E5-FF90-4A74-8707-0F8B98C09674" name="通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-048E2CD6-94A7-4BF7-A5A4-0DD8AF6C9C63" name="通过" sourceRef="sid-01162014-E410-4093-B0BF-4DC735CE9D7B" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" name="未通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-12EF6884-8C49-425E-92E3-F158345B016D" name="未通过" sourceRef="sid-01162014-E410-4093-B0BF-4DC735CE9D7B" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_audit_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_audit_apply" id="BPMNPlane_oil_audit_apply">
@@ -55,22 +62,22 @@
         <omgdc:Bounds height="80.0" width="100.0" x="210.0" y="75.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B" id="BPMNShape_sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B">
-        <omgdc:Bounds height="28.0" width="28.0" x="825.0" y="164.0"></omgdc:Bounds>
+        <omgdc:Bounds height="28.0" width="28.0" x="915.0" y="160.99999999999997"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-32EE47FB-8A0C-4052-B073-347747A2413C" id="BPMNShape_sid-32EE47FB-8A0C-4052-B073-347747A2413C">
-        <omgdc:Bounds height="30.0" width="30.0" x="755.0" y="240.0"></omgdc:Bounds>
+        <omgdc:Bounds height="30.00000000000003" width="30.0" x="845.0" y="236.99999999999997"></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="100.0" x="390.0" y="138.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="405.0" y="135.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" id="BPMNShape_sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE">
-        <omgdc:Bounds height="40.0" width="40.0" x="510.0" y="158.00000000000003"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="600.0" y="155.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" id="BPMNShape_sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9">
-        <omgdc:Bounds height="80.0" width="100.0" x="585.0" y="138.00000000000003"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="675.0" y="135.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" id="BPMNShape_sid-B93E1164-9FAC-4D21-A691-2A4411C35635">
-        <omgdc:Bounds height="40.0" width="40.0" x="750.0" y="158.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="840.0" y="154.99999999999997"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-9F109B73-35DC-42B6-9B6F-50816C67223E" id="BPMNShape_sid-9F109B73-35DC-42B6-9B6F-50816C67223E">
         <omgdc:Bounds height="40.0" width="40.0" x="95.0" y="158.0"></omgdc:Bounds>
@@ -81,59 +88,70 @@
       <bpmndi:BPMNShape bpmnElement="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8" id="BPMNShape_sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8">
         <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="215.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-179CD02C-C471-44D4-A64E-82BCEC645FA6" id="BPMNEdge_sid-179CD02C-C471-44D4-A64E-82BCEC645FA6">
-        <omgdi:waypoint x="250.0" y="255.0"></omgdi:waypoint>
-        <omgdi:waypoint x="270.0" y="255.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" id="BPMNEdge_sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163">
-        <omgdi:waypoint x="530.5555419921875" y="197.44445800781253"></omgdi:waypoint>
-        <omgdi:waypoint x="530.5555419921875" y="255.00000000000003"></omgdi:waypoint>
-        <omgdi:waypoint x="755.0" y="255.00000000000003"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape bpmnElement="sid-01162014-E410-4093-B0BF-4DC735CE9D7B" id="BPMNShape_sid-01162014-E410-4093-B0BF-4DC735CE9D7B">
+        <omgdc:Bounds height="40.0" width="40.0" x="435.0" y="235.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-B002321E-58A5-4512-B00E-CB14E02E6DAD" id="BPMNEdge_sid-B002321E-58A5-4512-B00E-CB14E02E6DAD">
         <omgdi:waypoint x="115.5" y="197.5"></omgdi:waypoint>
         <omgdi:waypoint x="115.5" y="255.0"></omgdi:waypoint>
         <omgdi:waypoint x="150.0" y="255.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" id="BPMNEdge_sid-0F7FB010-0A59-4862-8046-36C4B320FB28">
-        <omgdi:waypoint x="770.375" y="197.625"></omgdi:waypoint>
-        <omgdi:waypoint x="770.0980371217038" y="240.00032037932917"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" id="BPMNEdge_sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A">
-        <omgdi:waypoint x="685.0" y="178.18450184501847"></omgdi:waypoint>
-        <omgdi:waypoint x="750.425925925926" y="178.42592592592592"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-12EF6884-8C49-425E-92E3-F158345B016D" id="BPMNEdge_sid-12EF6884-8C49-425E-92E3-F158345B016D">
+        <omgdi:waypoint x="474.8478942793957" y="255.1521057206043"></omgdi:waypoint>
+        <omgdi:waypoint x="650.1500244140625" y="252.0"></omgdi:waypoint>
+        <omgdi:waypoint x="845.0" y="252.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-BB78E104-5EE5-462C-8332-9774206D19BA" id="BPMNEdge_sid-BB78E104-5EE5-462C-8332-9774206D19BA">
         <omgdi:waypoint x="59.99962276962535" y="178.106380303331"></omgdi:waypoint>
         <omgdi:waypoint x="95.35714285714297" y="178.35714285714297"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" id="BPMNEdge_sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D">
-        <omgdi:waypoint x="789.6397058823529" y="178.36029411764707"></omgdi:waypoint>
-        <omgdi:waypoint x="825.0003729405028" y="178.10218705882846"></omgdi:waypoint>
+        <omgdi:waypoint x="879.6397058823529" y="175.36029411764704"></omgdi:waypoint>
+        <omgdi:waypoint x="915.0003729405028" y="175.10218705882843"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01" id="BPMNEdge_sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01">
-        <omgdi:waypoint x="370.0" y="255.0"></omgdi:waypoint>
-        <omgdi:waypoint x="440.0" y="255.0"></omgdi:waypoint>
-        <omgdi:waypoint x="440.0" y="218.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" id="BPMNEdge_sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46">
-        <omgdi:waypoint x="490.0" y="178.27624309392266"></omgdi:waypoint>
-        <omgdi:waypoint x="510.38888888888886" y="178.3888888888889"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-048E2CD6-94A7-4BF7-A5A4-0DD8AF6C9C63" id="BPMNEdge_sid-048E2CD6-94A7-4BF7-A5A4-0DD8AF6C9C63">
+        <omgdi:waypoint x="456.1339604359627" y="236.1339604359627"></omgdi:waypoint>
+        <omgdi:waypoint x="455.741951234879" y="215.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-BCE3633B-A666-47A5-A005-216CF9EBBA95" id="BPMNEdge_sid-BCE3633B-A666-47A5-A005-216CF9EBBA95">
         <omgdi:waypoint x="310.0" y="115.0"></omgdi:waypoint>
-        <omgdi:waypoint x="440.0" y="115.0"></omgdi:waypoint>
-        <omgdi:waypoint x="440.0" y="138.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-002682E5-FF90-4A74-8707-0F8B98C09674" id="BPMNEdge_sid-002682E5-FF90-4A74-8707-0F8B98C09674">
-        <omgdi:waypoint x="549.5913461538462" y="178.40865384615387"></omgdi:waypoint>
-        <omgdi:waypoint x="585.0" y="178.2392344497608"></omgdi:waypoint>
+        <omgdi:waypoint x="455.0" y="115.0"></omgdi:waypoint>
+        <omgdi:waypoint x="455.0" y="135.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-284BE3C1-637A-496C-B7B3-CEFB815A8BF2" id="BPMNEdge_sid-284BE3C1-637A-496C-B7B3-CEFB815A8BF2">
         <omgdi:waypoint x="115.5" y="158.5"></omgdi:waypoint>
         <omgdi:waypoint x="115.5" y="115.0"></omgdi:waypoint>
         <omgdi:waypoint x="210.0" y="115.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-179CD02C-C471-44D4-A64E-82BCEC645FA6" id="BPMNEdge_sid-179CD02C-C471-44D4-A64E-82BCEC645FA6">
+        <omgdi:waypoint x="250.0" y="255.0"></omgdi:waypoint>
+        <omgdi:waypoint x="270.0" y="255.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" id="BPMNEdge_sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163">
+        <omgdi:waypoint x="620.5555419921875" y="194.4444580078125"></omgdi:waypoint>
+        <omgdi:waypoint x="620.5555419921875" y="252.0"></omgdi:waypoint>
+        <omgdi:waypoint x="845.0" y="252.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" id="BPMNEdge_sid-0F7FB010-0A59-4862-8046-36C4B320FB28">
+        <omgdi:waypoint x="860.375" y="194.62499999999997"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0980371217038" y="237.00032037932917"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" id="BPMNEdge_sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A">
+        <omgdi:waypoint x="775.0" y="175.18450184501845"></omgdi:waypoint>
+        <omgdi:waypoint x="840.425925925926" y="175.4259259259259"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01" id="BPMNEdge_sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01">
+        <omgdi:waypoint x="370.0" y="255.18450184501845"></omgdi:waypoint>
+        <omgdi:waypoint x="435.4259259259259" y="255.42592592592592"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" id="BPMNEdge_sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46">
+        <omgdi:waypoint x="505.0" y="175.1510574018127"></omgdi:waypoint>
+        <omgdi:waypoint x="600.439393939394" y="175.43939393939394"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-002682E5-FF90-4A74-8707-0F8B98C09674" id="BPMNEdge_sid-002682E5-FF90-4A74-8707-0F8B98C09674">
+        <omgdi:waypoint x="639.5913461538462" y="175.40865384615384"></omgdi:waypoint>
+        <omgdi:waypoint x="675.0" y="175.23923444976077"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>

+ 32 - 15
src/main/resources/processes/oil_enuser_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_enuser_append_apply" name="oil_enuser_append_apply" isExecutable="true">
-    <documentation>企业用户增项审批流程</documentation>
+    <documentation>增项审批流程</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
     <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
     <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="业务处室专业审批" activiti:candidateUsers="${users}"></userTask>
@@ -17,9 +17,6 @@
     <sequenceFlow id="sid-89ED731E-278D-4033-8445-73676D8B5F0A" name="审批" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></sequenceFlow>
     <sequenceFlow id="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" sourceRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" targetRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></sequenceFlow>
     <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
-    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </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>
@@ -45,16 +42,13 @@
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-E19E2941-6B2A-4114-B292-5D789BA0959A" name="通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3"></sequenceFlow>
-    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <userTask id="sid-4FD46894-7B2E-40BC-8244-11046C82B5F1" name="供方申请" activiti:assignee="${recorder}">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-76A34CB7-BE2A-495F-84D7-C534209F5497" sourceRef="sid-4FD46894-7B2E-40BC-8244-11046C82B5F1" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
-    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
+    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-2653B15C-B8A5-4534-B9AF-497FD1A1F0E4"></sequenceFlow>
     <exclusiveGateway id="sid-0554D3E7-280D-4464-8341-A91D8282F440"></exclusiveGateway>
     <sequenceFlow id="sid-2A034CD8-BB86-4783-97D9-DBAE8D4A7199" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-0554D3E7-280D-4464-8341-A91D8282F440"></sequenceFlow>
     <sequenceFlow id="sid-EAA27926-4720-46EE-ABB6-4A72D848B44F" name="二级单位代办" sourceRef="sid-0554D3E7-280D-4464-8341-A91D8282F440" targetRef="sid-4FD46894-7B2E-40BC-8244-11046C82B5F1">
@@ -63,6 +57,19 @@
     <sequenceFlow id="sid-81806C31-8CF8-429C-A347-278C2A8B9476" name="企业用户申请" sourceRef="sid-0554D3E7-280D-4464-8341-A91D8282F440" targetRef="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <exclusiveGateway id="sid-2653B15C-B8A5-4534-B9AF-497FD1A1F0E4"></exclusiveGateway>
+    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-2E471933-59BB-4B3B-A806-65345E16FED5" name="通过" sourceRef="sid-2653B15C-B8A5-4534-B9AF-497FD1A1F0E4" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-A6CA55A7-A87B-48DE-BBF2-7351CB48AE8B" name="不通过" sourceRef="sid-2653B15C-B8A5-4534-B9AF-497FD1A1F0E4" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_enuser_append_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_enuser_append_apply" id="BPMNPlane_oil_enuser_append_apply">
@@ -114,6 +121,9 @@
       <bpmndi:BPMNShape bpmnElement="sid-0554D3E7-280D-4464-8341-A91D8282F440" id="BPMNShape_sid-0554D3E7-280D-4464-8341-A91D8282F440">
         <omgdc:Bounds height="40.0" width="40.0" x="105.0" y="275.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-2653B15C-B8A5-4534-B9AF-497FD1A1F0E4" id="BPMNShape_sid-2653B15C-B8A5-4534-B9AF-497FD1A1F0E4">
+        <omgdc:Bounds height="40.0" width="40.0" x="420.0" y="370.0000000000001"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
         <omgdi:waypoint x="1015.0" y="295.0"></omgdi:waypoint>
         <omgdi:waypoint x="1050.0" y="295.0"></omgdi:waypoint>
@@ -137,9 +147,12 @@
         <omgdi:waypoint x="525.0" y="295.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
-        <omgdi:waypoint x="385.0" y="390.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="440.0" y="390.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="440.0" y="335.0"></omgdi:waypoint>
+        <omgdi:waypoint x="385.0" y="390.23696682464464"></omgdi:waypoint>
+        <omgdi:waypoint x="420.4047619047619" y="390.40476190476204"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2E471933-59BB-4B3B-A806-65345E16FED5" id="BPMNEdge_sid-2E471933-59BB-4B3B-A806-65345E16FED5">
+        <omgdi:waypoint x="440.39473684210526" y="370.3947368421054"></omgdi:waypoint>
+        <omgdi:waypoint x="440.20942408376965" y="335.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2A034CD8-BB86-4783-97D9-DBAE8D4A7199" id="BPMNEdge_sid-2A034CD8-BB86-4783-97D9-DBAE8D4A7199">
         <omgdi:waypoint x="74.99956298163058" y="295.1145004807758"></omgdi:waypoint>
@@ -166,15 +179,15 @@
         <omgdi:waypoint x="895.0" y="295.0"></omgdi:waypoint>
         <omgdi:waypoint x="915.0" y="295.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
+        <omgdi:waypoint x="759.5913461538462" y="295.40865384615387"></omgdi:waypoint>
+        <omgdi:waypoint x="795.0" y="295.2392344497608"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
         <omgdi:waypoint x="545.5" y="314.5"></omgdi:waypoint>
         <omgdi:waypoint x="545.5" y="390.0000000000001"></omgdi:waypoint>
         <omgdi:waypoint x="1265.0" y="390.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
-        <omgdi:waypoint x="759.5913461538462" y="295.40865384615387"></omgdi:waypoint>
-        <omgdi:waypoint x="795.0" y="295.2392344497608"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
         <omgdi:waypoint x="1225.0000000000002" y="295.2369668246445"></omgdi:waypoint>
         <omgdi:waypoint x="1260.404761904762" y="295.4047619047619"></omgdi:waypoint>
@@ -197,6 +210,10 @@
         <omgdi:waypoint x="1089.5913461538462" y="295.40865384615387"></omgdi:waypoint>
         <omgdi:waypoint x="1125.0" y="295.2392344497608"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A6CA55A7-A87B-48DE-BBF2-7351CB48AE8B" id="BPMNEdge_sid-A6CA55A7-A87B-48DE-BBF2-7351CB48AE8B">
+        <omgdi:waypoint x="459.5113230035757" y="390.48867699642443"></omgdi:waypoint>
+        <omgdi:waypoint x="1265.0000026604785" y="390.0089338876353"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>

+ 38 - 21
src/main/resources/processes/oil_enuser_supplier_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_enuser_supplier_apply" name="oil_enuser_supplier_apply" isExecutable="true">
-    <documentation>企业用户准入审批流程</documentation>
+    <documentation>准入审批流程</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
     <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
     <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="业务处室专业审批" activiti:candidateUsers="${users}"></userTask>
@@ -17,9 +17,6 @@
     <sequenceFlow id="sid-89ED731E-278D-4033-8445-73676D8B5F0A" name="审批" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></sequenceFlow>
     <sequenceFlow id="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" sourceRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" targetRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></sequenceFlow>
     <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
-    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </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>
@@ -36,7 +33,7 @@
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></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>
-    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
+    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-1800ECB9-20C5-496E-B0A1-7C84EB12D398"></sequenceFlow>
     <sequenceFlow id="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" sourceRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" targetRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></sequenceFlow>
     <sequenceFlow id="sid-C17BDEB5-74AD-41D3-96D4-89E5D1A42C79" sourceRef="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
     <sequenceFlow id="sid-80E2DC63-571F-46E0-AB37-B348B0EBE989" name="通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
@@ -54,15 +51,25 @@
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-09849778-F879-4B08-9476-A2CAF40106AF" sourceRef="sid-FB3354C5-511A-4A19-A51D-786B36A03367" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
-    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-830EE3E9-04C2-427B-8B57-055C0ED79829" name="二级单位代办" sourceRef="sid-E043FFDB-BFDE-4CD3-BED3-CDE743459E16" targetRef="sid-FB3354C5-511A-4A19-A51D-786B36A03367">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-C6000F43-905C-4393-9332-8E86848C87F8" name="企业用户申请" sourceRef="sid-E043FFDB-BFDE-4CD3-BED3-CDE743459E16" targetRef="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-77FAE19A-6218-4FAE-98BC-779BEED17045" name="通过" sourceRef="sid-1800ECB9-20C5-496E-B0A1-7C84EB12D398" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <exclusiveGateway id="sid-1800ECB9-20C5-496E-B0A1-7C84EB12D398"></exclusiveGateway>
+    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-C04DF3B6-4E75-4767-9985-5064E9D20B88" name="不通过" sourceRef="sid-1800ECB9-20C5-496E-B0A1-7C84EB12D398" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_enuser_supplier_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_enuser_supplier_apply" id="BPMNPlane_oil_enuser_supplier_apply">
@@ -70,7 +77,7 @@
         <omgdc:Bounds height="30.0" width="30.0" x="15.0" y="280.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" id="BPMNShape_sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-        <omgdc:Bounds height="80.0" width="100.0" x="285.0" y="345.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="285.0" y="350.0000000000001"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" id="BPMNShape_sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
         <omgdc:Bounds height="79.99999999999994" width="100.0" x="900.0" y="259.9999973509052"></omgdc:Bounds>
@@ -106,7 +113,7 @@
         <omgdc:Bounds height="80.0" width="100.0" x="765.0" y="259.99999735090523"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E" id="BPMNShape_sid-F49D476A-2CDD-4A35-8212-D88BA71F604E">
-        <omgdc:Bounds height="80.0" width="100.0" x="135.0" y="345.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="135.0" y="350.0000000000001"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-E043FFDB-BFDE-4CD3-BED3-CDE743459E16" id="BPMNShape_sid-E043FFDB-BFDE-4CD3-BED3-CDE743459E16">
         <omgdc:Bounds height="40.0" width="40.0" x="75.0" y="275.0"></omgdc:Bounds>
@@ -114,6 +121,9 @@
       <bpmndi:BPMNShape bpmnElement="sid-FB3354C5-511A-4A19-A51D-786B36A03367" id="BPMNShape_sid-FB3354C5-511A-4A19-A51D-786B36A03367">
         <omgdc:Bounds height="80.0" width="100.0" x="210.0" y="195.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-1800ECB9-20C5-496E-B0A1-7C84EB12D398" id="BPMNShape_sid-1800ECB9-20C5-496E-B0A1-7C84EB12D398">
+        <omgdc:Bounds height="40.0" width="40.0" x="405.0" y="370.0000000000001"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
         <omgdi:waypoint x="1000.0" y="299.9999973509049"></omgdi:waypoint>
         <omgdi:waypoint x="1035.0" y="299.9999973509048"></omgdi:waypoint>
@@ -132,22 +142,25 @@
         <omgdi:waypoint x="75.34615384615384" y="295.34615384615387"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
-        <omgdi:waypoint x="385.0" y="385.0"></omgdi:waypoint>
-        <omgdi:waypoint x="425.0" y="385.0"></omgdi:waypoint>
-        <omgdi:waypoint x="425.0" y="335.0"></omgdi:waypoint>
+        <omgdi:waypoint x="385.0" y="390.27624309392274"></omgdi:waypoint>
+        <omgdi:waypoint x="405.3888888888889" y="390.388888888889"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
         <omgdi:waypoint x="474.99999999999994" y="297.77777630605846"></omgdi:waypoint>
         <omgdi:waypoint x="496.05263105059606" y="298.94736630030917"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C17BDEB5-74AD-41D3-96D4-89E5D1A42C79" id="BPMNEdge_sid-C17BDEB5-74AD-41D3-96D4-89E5D1A42C79">
-        <omgdi:waypoint x="235.0" y="385.0"></omgdi:waypoint>
-        <omgdi:waypoint x="285.0" y="385.0"></omgdi:waypoint>
+        <omgdi:waypoint x="235.0" y="390.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="285.0" y="390.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
         <omgdi:waypoint x="534.5913461538462" y="300.4086511970591"></omgdi:waypoint>
         <omgdi:waypoint x="570.0" y="300.239231800666"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-77FAE19A-6218-4FAE-98BC-779BEED17045" id="BPMNEdge_sid-77FAE19A-6218-4FAE-98BC-779BEED17045">
+        <omgdi:waypoint x="425.39473684210526" y="370.3947368421054"></omgdi:waypoint>
+        <omgdi:waypoint x="425.20942408376965" y="335.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-80E2DC63-571F-46E0-AB37-B348B0EBE989" id="BPMNEdge_sid-80E2DC63-571F-46E0-AB37-B348B0EBE989">
         <omgdi:waypoint x="1284.6144578313254" y="300.3855395195798"></omgdi:waypoint>
         <omgdi:waypoint x="1335.0002509882663" y="300.0838281833104"></omgdi:waypoint>
@@ -161,15 +174,15 @@
         <omgdi:waypoint x="425.0" y="235.0"></omgdi:waypoint>
         <omgdi:waypoint x="425.0" y="255.00000000000006"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
+        <omgdi:waypoint x="729.5913461538461" y="300.40865119705865"></omgdi:waypoint>
+        <omgdi:waypoint x="765.0" y="300.2392318006658"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
         <omgdi:waypoint x="515.5" y="319.49999735090523"></omgdi:waypoint>
         <omgdi:waypoint x="515.5" y="390.0000000000001"></omgdi:waypoint>
         <omgdi:waypoint x="1250.0" y="390.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
-        <omgdi:waypoint x="729.5913461538461" y="300.40865119705865"></omgdi:waypoint>
-        <omgdi:waypoint x="765.0" y="300.2392318006658"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
         <omgdi:waypoint x="1210.0000000000002" y="300.23696417554953"></omgdi:waypoint>
         <omgdi:waypoint x="1245.4047619047617" y="300.40475925566705"></omgdi:waypoint>
@@ -183,6 +196,10 @@
         <omgdi:waypoint x="669.9999999999999" y="299.99999735090495"></omgdi:waypoint>
         <omgdi:waypoint x="689.9999999999999" y="299.99999735090483"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C04DF3B6-4E75-4767-9985-5064E9D20B88" id="BPMNEdge_sid-C04DF3B6-4E75-4767-9985-5064E9D20B88">
+        <omgdi:waypoint x="444.5113230035757" y="390.48867699642443"></omgdi:waypoint>
+        <omgdi:waypoint x="1250.0000026604785" y="390.0089338876353"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
         <omgdi:waypoint x="710.0" y="319.9999973509047"></omgdi:waypoint>
         <omgdi:waypoint x="710.0" y="390.0000000000001"></omgdi:waypoint>
@@ -194,8 +211,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C6000F43-905C-4393-9332-8E86848C87F8" id="BPMNEdge_sid-C6000F43-905C-4393-9332-8E86848C87F8">
         <omgdi:waypoint x="95.5" y="314.5"></omgdi:waypoint>
-        <omgdi:waypoint x="95.5" y="385.0"></omgdi:waypoint>
-        <omgdi:waypoint x="135.0" y="385.0"></omgdi:waypoint>
+        <omgdi:waypoint x="95.5" y="390.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="135.0" y="390.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 36 - 19
src/main/resources/processes/oil_first_enuser_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_first_enuser_append_apply" name="oil_first_enuser_append_apply" isExecutable="true">
-    <documentation>企业用户一级物资增项审批流程</documentation>
+    <documentation>一级物资增项审批流程</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
     <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
     <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="二级单位复审" activiti:candidateUsers="${users}"></userTask>
@@ -11,14 +11,11 @@
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>
     <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
-    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" sourceRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" targetRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></sequenceFlow>
     <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
+    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-0B8F4876-C7CF-4295-97BD-EEAF4F37D2EC"></sequenceFlow>
     <sequenceFlow id="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
@@ -28,9 +25,6 @@
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-91D1F045-5F6D-4F6F-9460-C67E468B8A48" sourceRef="sid-596FE9B9-3ABC-4D46-9775-165DD1AEE641" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
-    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
     <exclusiveGateway id="sid-097F4709-F690-4B86-AAB3-8F016466515B"></exclusiveGateway>
     <sequenceFlow id="sid-591E5B69-DFB1-4DA0-B76B-9162DD3979A6" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-097F4709-F690-4B86-AAB3-8F016466515B"></sequenceFlow>
     <userTask id="sid-05262BA2-249E-40A8-962F-F43F51842E24" name="供方申请" activiti:assignee="${recorder}">
@@ -45,6 +39,19 @@
     <sequenceFlow id="sid-9F642886-30D6-42E8-A950-35BD71C42B1E" name="二级单位代办" sourceRef="sid-097F4709-F690-4B86-AAB3-8F016466515B" targetRef="sid-05262BA2-249E-40A8-962F-F43F51842E24">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
+    <exclusiveGateway id="sid-0B8F4876-C7CF-4295-97BD-EEAF4F37D2EC"></exclusiveGateway>
+    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-527A78FE-2D0D-4CAC-82FC-6B42EDB23FCB" sourceRef="sid-0B8F4876-C7CF-4295-97BD-EEAF4F37D2EC" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-5094C1AE-A24F-4F27-83D5-1C03C5F29F60" name="不通过" sourceRef="sid-0B8F4876-C7CF-4295-97BD-EEAF4F37D2EC" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_first_enuser_append_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_first_enuser_append_apply" id="BPMNPlane_oil_first_enuser_append_apply">
@@ -81,32 +88,42 @@
       <bpmndi:BPMNShape bpmnElement="sid-05262BA2-249E-40A8-962F-F43F51842E24" id="BPMNShape_sid-05262BA2-249E-40A8-962F-F43F51842E24">
         <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="195.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
-        <omgdi:waypoint x="624.5913461538463" y="300.4086511970594"></omgdi:waypoint>
-        <omgdi:waypoint x="660.0" y="300.239231800666"></omgdi:waypoint>
+      <bpmndi:BPMNShape bpmnElement="sid-0B8F4876-C7CF-4295-97BD-EEAF4F37D2EC" id="BPMNShape_sid-0B8F4876-C7CF-4295-97BD-EEAF4F37D2EC">
+        <omgdc:Bounds height="40.0" width="40.0" x="495.0" y="355.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
+        <omgdi:waypoint x="565.0" y="299.99999735090563"></omgdi:waypoint>
+        <omgdi:waypoint x="585.0" y="299.9999973509057"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
+        <omgdi:waypoint x="445.0" y="375.20746887966806"></omgdi:waypoint>
+        <omgdi:waypoint x="495.4166666666667" y="375.4166666666667"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-91D1F045-5F6D-4F6F-9460-C67E468B8A48" id="BPMNEdge_sid-91D1F045-5F6D-4F6F-9460-C67E468B8A48">
         <omgdi:waypoint x="310.0" y="375.0"></omgdi:waypoint>
         <omgdi:waypoint x="345.0" y="375.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
+        <omgdi:waypoint x="624.5913461538463" y="300.4086511970594"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="300.239231800666"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-435D14E5-E6AE-49AE-AB19-8F9E7138E462" id="BPMNEdge_sid-435D14E5-E6AE-49AE-AB19-8F9E7138E462">
         <omgdi:waypoint x="170.5" y="304.5"></omgdi:waypoint>
         <omgdi:waypoint x="170.5" y="375.0"></omgdi:waypoint>
         <omgdi:waypoint x="210.0" y="375.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-5094C1AE-A24F-4F27-83D5-1C03C5F29F60" id="BPMNEdge_sid-5094C1AE-A24F-4F27-83D5-1C03C5F29F60">
+        <omgdi:waypoint x="534.5317725752508" y="375.46822742474916"></omgdi:waypoint>
+        <omgdi:waypoint x="800.0000209029081" y="375.02504170133074"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-9F642886-30D6-42E8-A950-35BD71C42B1E" id="BPMNEdge_sid-9F642886-30D6-42E8-A950-35BD71C42B1E">
         <omgdi:waypoint x="170.5" y="265.5"></omgdi:waypoint>
         <omgdi:waypoint x="170.5" y="235.0"></omgdi:waypoint>
         <omgdi:waypoint x="270.0" y="235.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
-        <omgdi:waypoint x="565.0" y="299.99999735090563"></omgdi:waypoint>
-        <omgdi:waypoint x="585.0" y="299.9999973509057"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
-        <omgdi:waypoint x="445.0" y="375.0"></omgdi:waypoint>
-        <omgdi:waypoint x="515.0" y="375.0"></omgdi:waypoint>
-        <omgdi:waypoint x="515.0" y="339.9999973509055"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-527A78FE-2D0D-4CAC-82FC-6B42EDB23FCB" id="BPMNEdge_sid-527A78FE-2D0D-4CAC-82FC-6B42EDB23FCB">
+        <omgdi:waypoint x="515.3666666713762" y="355.36666667137615"></omgdi:waypoint>
+        <omgdi:waypoint x="515.264900652957" y="339.9999973509055"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
         <omgdi:waypoint x="834.6792452830192" y="300.32075206788653"></omgdi:waypoint>

+ 59 - 42
src/main/resources/processes/oil_first_enuser_supplier_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_first_enuser_supplier_apply" name="oil_first_enuser_supplier_apply" isExecutable="true">
-    <documentation>企业用户一级物资准入审批流程</documentation>
+    <documentation>一级物资准入审批流程(分办退回)</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
     <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
     <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="二级单位复审" activiti:candidateUsers="${users}"></userTask>
@@ -11,14 +11,8 @@
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>
     <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
-    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" sourceRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" targetRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></sequenceFlow>
-    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
-    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
+    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-24FA450B-ADBC-4568-98EE-7BD6180F87B2"></sequenceFlow>
     <userTask id="sid-596FE9B9-3ABC-4D46-9775-165DD1AEE641" name="企业用户申请" activiti:assignee="${recorder}">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
@@ -45,14 +39,27 @@
     <sequenceFlow id="sid-C234D6F2-3E56-43C4-A07D-04F49020E4F4" sourceRef="sid-E4285C8B-C8D4-4D48-9617-161BC532F1FE" targetRef="sid-596FE9B9-3ABC-4D46-9775-165DD1AEE641">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <exclusiveGateway id="sid-24FA450B-ADBC-4568-98EE-7BD6180F87B2"></exclusiveGateway>
+    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-FC6D90A9-28B1-49C0-B000-44DE1E8C76CC" sourceRef="sid-24FA450B-ADBC-4568-98EE-7BD6180F87B2" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-8CF8EEE5-2430-4074-A43A-ED7A2D04A745" name="不通过" sourceRef="sid-24FA450B-ADBC-4568-98EE-7BD6180F87B2" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_first_enuser_supplier_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_first_enuser_supplier_apply" id="BPMNPlane_oil_first_enuser_supplier_apply">
       <bpmndi:BPMNShape bpmnElement="sid-9A4918D7-8376-4A00-928A-6415D92565EC" id="BPMNShape_sid-9A4918D7-8376-4A00-928A-6415D92565EC">
-        <omgdc:Bounds height="30.0" width="30.0" x="105.0" y="284.9999973509056"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="105.0" y="290.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" id="BPMNShape_sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-        <omgdc:Bounds height="79.99999999999994" width="100.0" x="360.0" y="335.0"></omgdc:Bounds>
+        <omgdc:Bounds height="79.99999999999994" width="100.0" x="360.0" y="340.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" id="BPMNShape_sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
         <omgdc:Bounds height="79.99999999999994" width="99.99999999999989" x="675.0" y="259.9999973509049"></omgdc:Bounds>
@@ -70,61 +77,71 @@
         <omgdc:Bounds height="28.0" width="28.0" x="885.0" y="285.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-3DF26A43-3984-4930-AA15-6CBD627202FE" id="BPMNShape_sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
-        <omgdc:Bounds height="30.0" width="30.0" x="815.0" y="360.0"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="815.0" y="365.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-596FE9B9-3ABC-4D46-9775-165DD1AEE641" id="BPMNShape_sid-596FE9B9-3ABC-4D46-9775-165DD1AEE641">
-        <omgdc:Bounds height="80.0" width="100.0" x="225.0" y="335.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="210.0" y="345.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-E4285C8B-C8D4-4D48-9617-161BC532F1FE" id="BPMNShape_sid-E4285C8B-C8D4-4D48-9617-161BC532F1FE">
-        <omgdc:Bounds height="40.0" width="40.0" x="165.0" y="279.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="165.0" y="285.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-9BAE93E0-0963-4BB3-8773-3BFD7196E06C" id="BPMNShape_sid-9BAE93E0-0963-4BB3-8773-3BFD7196E06C">
         <omgdc:Bounds height="80.0" width="100.0" x="285.0" y="195.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
-        <omgdi:waypoint x="639.5913461538463" y="300.40865119705927"></omgdi:waypoint>
-        <omgdi:waypoint x="675.0" y="300.239231800666"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-91D1F045-5F6D-4F6F-9460-C67E468B8A48" id="BPMNEdge_sid-91D1F045-5F6D-4F6F-9460-C67E468B8A48">
-        <omgdi:waypoint x="325.0" y="375.0"></omgdi:waypoint>
-        <omgdi:waypoint x="360.0" y="375.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape bpmnElement="sid-24FA450B-ADBC-4568-98EE-7BD6180F87B2" id="BPMNShape_sid-24FA450B-ADBC-4568-98EE-7BD6180F87B2">
+        <omgdc:Bounds height="40.0" width="40.0" x="510.0" y="360.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-7440DC59-BC4C-4459-821D-5B2AC1FDC33E" id="BPMNEdge_sid-7440DC59-BC4C-4459-821D-5B2AC1FDC33E">
-        <omgdi:waypoint x="185.5" y="279.5"></omgdi:waypoint>
+        <omgdi:waypoint x="185.5" y="285.5"></omgdi:waypoint>
         <omgdi:waypoint x="185.5" y="235.0"></omgdi:waypoint>
         <omgdi:waypoint x="285.0" y="235.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-9931EDC5-3B59-4EF7-B993-6EBE003B3307" id="BPMNEdge_sid-9931EDC5-3B59-4EF7-B993-6EBE003B3307">
-        <omgdi:waypoint x="385.0" y="235.0"></omgdi:waypoint>
-        <omgdi:waypoint x="530.0" y="235.0"></omgdi:waypoint>
-        <omgdi:waypoint x="530.0" y="259.9999973509055"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-3D8AC84F-4D7B-4316-85BE-E07E13736320" id="BPMNEdge_sid-3D8AC84F-4D7B-4316-85BE-E07E13736320">
-        <omgdi:waypoint x="134.99956298626117" y="299.8854974767396"></omgdi:waypoint>
-        <omgdi:waypoint x="165.6515143548407" y="299.65151435484074"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-8CF8EEE5-2430-4074-A43A-ED7A2D04A745" id="BPMNEdge_sid-8CF8EEE5-2430-4074-A43A-ED7A2D04A745">
+        <omgdi:waypoint x="549.5317725752508" y="380.46822742474916"></omgdi:waypoint>
+        <omgdi:waypoint x="815.0000209029081" y="380.02504170133074"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
         <omgdi:waypoint x="580.0" y="299.9999973509056"></omgdi:waypoint>
         <omgdi:waypoint x="600.0" y="299.9999973509056"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
-        <omgdi:waypoint x="460.0" y="375.0"></omgdi:waypoint>
-        <omgdi:waypoint x="530.0" y="375.0"></omgdi:waypoint>
-        <omgdi:waypoint x="530.0" y="339.9999973509055"></omgdi:waypoint>
+        <omgdi:waypoint x="460.0" y="380.20746887966806"></omgdi:waypoint>
+        <omgdi:waypoint x="510.4166666666667" y="380.4166666666667"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
-        <omgdi:waypoint x="620.5" y="319.4999973509056"></omgdi:waypoint>
-        <omgdi:waypoint x="620.5" y="375.0"></omgdi:waypoint>
-        <omgdi:waypoint x="815.0" y="375.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-FC6D90A9-28B1-49C0-B000-44DE1E8C76CC" id="BPMNEdge_sid-FC6D90A9-28B1-49C0-B000-44DE1E8C76CC">
+        <omgdi:waypoint x="530.5" y="360.5"></omgdi:waypoint>
+        <omgdi:waypoint x="530.5" y="339.9999973509055"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C234D6F2-3E56-43C4-A07D-04F49020E4F4" id="BPMNEdge_sid-C234D6F2-3E56-43C4-A07D-04F49020E4F4">
+        <omgdi:waypoint x="185.5" y="324.5"></omgdi:waypoint>
+        <omgdi:waypoint x="185.5" y="385.0"></omgdi:waypoint>
+        <omgdi:waypoint x="210.0" y="385.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-91D1F045-5F6D-4F6F-9460-C67E468B8A48" id="BPMNEdge_sid-91D1F045-5F6D-4F6F-9460-C67E468B8A48">
+        <omgdi:waypoint x="310.0" y="383.3333333333333"></omgdi:waypoint>
+        <omgdi:waypoint x="360.0" y="381.6666666666667"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
+        <omgdi:waypoint x="639.5913461538463" y="300.40865119705927"></omgdi:waypoint>
+        <omgdi:waypoint x="675.0" y="300.239231800666"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-9931EDC5-3B59-4EF7-B993-6EBE003B3307" id="BPMNEdge_sid-9931EDC5-3B59-4EF7-B993-6EBE003B3307">
+        <omgdi:waypoint x="385.0" y="235.0"></omgdi:waypoint>
+        <omgdi:waypoint x="530.0" y="235.0"></omgdi:waypoint>
+        <omgdi:waypoint x="530.0" y="259.9999973509055"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-3D8AC84F-4D7B-4316-85BE-E07E13736320" id="BPMNEdge_sid-3D8AC84F-4D7B-4316-85BE-E07E13736320">
+        <omgdi:waypoint x="134.99956298163056" y="305.1145004807758"></omgdi:waypoint>
+        <omgdi:waypoint x="165.34615384615384" y="305.34615384615387"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
         <omgdi:waypoint x="849.745160632487" y="300.2548367184186"></omgdi:waypoint>
         <omgdi:waypoint x="885.0019470933717" y="299.80570687049106"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-C234D6F2-3E56-43C4-A07D-04F49020E4F4" id="BPMNEdge_sid-C234D6F2-3E56-43C4-A07D-04F49020E4F4">
-        <omgdi:waypoint x="185.5" y="318.5"></omgdi:waypoint>
-        <omgdi:waypoint x="185.5" y="375.0"></omgdi:waypoint>
-        <omgdi:waypoint x="225.0" y="375.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
+        <omgdi:waypoint x="620.5" y="319.4999973509056"></omgdi:waypoint>
+        <omgdi:waypoint x="620.5" y="380.0"></omgdi:waypoint>
+        <omgdi:waypoint x="815.0" y="380.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
         <omgdi:waypoint x="774.9999999999999" y="299.99999735090535"></omgdi:waypoint>
@@ -132,7 +149,7 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
         <omgdi:waypoint x="830.0" y="319.9999973509056"></omgdi:waypoint>
-        <omgdi:waypoint x="830.0" y="360.0"></omgdi:waypoint>
+        <omgdi:waypoint x="830.0" y="365.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 49 - 32
src/main/resources/processes/oil_info_change.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_info_change" name="oil_info_change" isExecutable="true">
-    <documentation>供方信息变更流程图</documentation>
+    <documentation>供方信息变更流程图(分布可退回)</documentation>
     <startEvent id="startEvent1"></startEvent>
     <userTask id="sid-F5587778-2194-43BD-B5A9-23041685B24E" name="供方申请" activiti:assignee="${recorder}">
       <extensionElements>
@@ -23,15 +23,9 @@
     <userTask id="sid-6FDA29DE-91D5-439A-AFF8-CE518926AEC1" name="二级单位复审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-3A58E678-9DAB-4D47-94DD-A87555607A9A"></exclusiveGateway>
     <sequenceFlow id="sid-2116D691-BD6C-4ABA-9346-27611BD512E7" sourceRef="sid-6FDA29DE-91D5-439A-AFF8-CE518926AEC1" targetRef="sid-3A58E678-9DAB-4D47-94DD-A87555607A9A"></sequenceFlow>
-    <sequenceFlow id="sid-CB8A153B-3D62-4EE1-B48E-603926F38CC2" name="未通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-74886C9A-F93E-45FD-B170-FDA4BB0535C1" name="未通过" sourceRef="sid-3A58E678-9DAB-4D47-94DD-A87555607A9A" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-F1508FC5-65F1-4AE5-9EEB-9AD6EE531B10" name="通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-6FDA29DE-91D5-439A-AFF8-CE518926AEC1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-A26EFFF7-C36E-4B34-9AF1-7FF4645F64BC" name="通过" sourceRef="sid-3A58E678-9DAB-4D47-94DD-A87555607A9A" targetRef="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
@@ -44,7 +38,7 @@
     </userTask>
     <userTask id="sid-C3A26CEB-8B27-4D61-A791-763DF5641174" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-91D827C5-38C6-4122-99E9-F28483D48060" sourceRef="sid-13C89744-1F3D-42D3-9412-B7A1DA450BC1" targetRef="sid-C3A26CEB-8B27-4D61-A791-763DF5641174"></sequenceFlow>
-    <sequenceFlow id="sid-503EEA60-EC8C-4130-8B49-BC1A3275FEE4" sourceRef="sid-C3A26CEB-8B27-4D61-A791-763DF5641174" targetRef="sid-577C4501-C135-43AE-8EF8-8DB311E72798"></sequenceFlow>
+    <sequenceFlow id="sid-503EEA60-EC8C-4130-8B49-BC1A3275FEE4" sourceRef="sid-C3A26CEB-8B27-4D61-A791-763DF5641174" targetRef="sid-EABB05FE-14EF-4526-BE46-D9EE28C053F1"></sequenceFlow>
     <sequenceFlow id="sid-1A93F85B-6DDE-4990-8984-F7988C654D15" name="二级单位代办" sourceRef="sid-5A31FEC7-5280-4753-975F-F157F53860E2" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
@@ -54,11 +48,24 @@
     <sequenceFlow id="sid-FF876226-1C90-40F2-B4E3-62947A248E25" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
+    <exclusiveGateway id="sid-EABB05FE-14EF-4526-BE46-D9EE28C053F1"></exclusiveGateway>
+    <sequenceFlow id="sid-F1508FC5-65F1-4AE5-9EEB-9AD6EE531B10" name="通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-6FDA29DE-91D5-439A-AFF8-CE518926AEC1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-29ABB88A-6AC9-4765-A254-F03E0F2173DB" name="通过" sourceRef="sid-EABB05FE-14EF-4526-BE46-D9EE28C053F1" targetRef="sid-577C4501-C135-43AE-8EF8-8DB311E72798">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-CB8A153B-3D62-4EE1-B48E-603926F38CC2" name="未通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-E6FDDF2A-D792-4586-8072-D7BCBE3A9B04" name="未通过" sourceRef="sid-EABB05FE-14EF-4526-BE46-D9EE28C053F1" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_info_change">
     <bpmndi:BPMNPlane bpmnElement="oil_info_change" id="BPMNPlane_oil_info_change">
       <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
-        <omgdc:Bounds height="30.0" width="30.0" x="15.0" y="150.0"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="15.0" y="170.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-F5587778-2194-43BD-B5A9-23041685B24E" id="BPMNShape_sid-F5587778-2194-43BD-B5A9-23041685B24E">
         <omgdc:Bounds height="80.0" width="100.0" x="165.0" y="75.0"></omgdc:Bounds>
@@ -76,7 +83,7 @@
         <omgdc:Bounds height="28.0" width="28.0" x="1020.0" y="164.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <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="950.0" y="225.00000000000028"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="950.0" y="260.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-577C4501-C135-43AE-8EF8-8DB311E72798" id="BPMNShape_sid-577C4501-C135-43AE-8EF8-8DB311E72798">
         <omgdc:Bounds height="79.0" width="113.0" x="375.0" y="138.5"></omgdc:Bounds>
@@ -88,13 +95,16 @@
         <omgdc:Bounds height="40.0" width="40.0" x="705.0" y="158.00000000000057"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-5A31FEC7-5280-4753-975F-F157F53860E2" id="BPMNShape_sid-5A31FEC7-5280-4753-975F-F157F53860E2">
-        <omgdc:Bounds height="40.0" width="40.0" x="75.0" y="145.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="75.0" y="165.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-13C89744-1F3D-42D3-9412-B7A1DA450BC1" id="BPMNShape_sid-13C89744-1F3D-42D3-9412-B7A1DA450BC1">
-        <omgdc:Bounds height="80.0" width="100.0" x="120.0" y="210.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="120.0" y="240.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-C3A26CEB-8B27-4D61-A791-763DF5641174" id="BPMNShape_sid-C3A26CEB-8B27-4D61-A791-763DF5641174">
-        <omgdc:Bounds height="80.0" width="100.0" x="255.0" y="210.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="255.0" y="235.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-EABB05FE-14EF-4526-BE46-D9EE28C053F1" id="BPMNShape_sid-EABB05FE-14EF-4526-BE46-D9EE28C053F1">
+        <omgdc:Bounds height="40.0" width="40.0" x="411.5" y="255.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-F1508FC5-65F1-4AE5-9EEB-9AD6EE531B10" id="BPMNEdge_sid-F1508FC5-65F1-4AE5-9EEB-9AD6EE531B10">
         <omgdi:waypoint x="549.5913461538462" y="178.40865384615384"></omgdi:waypoint>
@@ -106,8 +116,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-74886C9A-F93E-45FD-B170-FDA4BB0535C1" id="BPMNEdge_sid-74886C9A-F93E-45FD-B170-FDA4BB0535C1">
         <omgdi:waypoint x="725.5" y="197.50000000000057"></omgdi:waypoint>
-        <omgdi:waypoint x="725.5" y="240.00000000000028"></omgdi:waypoint>
-        <omgdi:waypoint x="950.0" y="240.00000000000028"></omgdi:waypoint>
+        <omgdi:waypoint x="725.5" y="275.0"></omgdi:waypoint>
+        <omgdi:waypoint x="950.0" y="275.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754" id="BPMNEdge_sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754">
         <omgdi:waypoint x="488.0" y="178.01294980517991"></omgdi:waypoint>
@@ -118,49 +128,56 @@
         <omgdi:waypoint x="431.5" y="115.0"></omgdi:waypoint>
         <omgdi:waypoint x="431.5" y="138.5"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-46870BF9-F391-476D-AB42-34F55B043506" id="BPMNEdge_sid-46870BF9-F391-476D-AB42-34F55B043506">
+        <omgdi:waypoint x="95.5" y="204.5"></omgdi:waypoint>
+        <omgdi:waypoint x="95.5" y="280.0"></omgdi:waypoint>
+        <omgdi:waypoint x="120.0" y="280.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-CB8A153B-3D62-4EE1-B48E-603926F38CC2" id="BPMNEdge_sid-CB8A153B-3D62-4EE1-B48E-603926F38CC2">
         <omgdi:waypoint x="530.5" y="197.5"></omgdi:waypoint>
-        <omgdi:waypoint x="530.5" y="240.00000000000028"></omgdi:waypoint>
-        <omgdi:waypoint x="950.0" y="240.00000000000028"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-46870BF9-F391-476D-AB42-34F55B043506" id="BPMNEdge_sid-46870BF9-F391-476D-AB42-34F55B043506">
-        <omgdi:waypoint x="95.5" y="184.5"></omgdi:waypoint>
-        <omgdi:waypoint x="95.5" y="250.0"></omgdi:waypoint>
-        <omgdi:waypoint x="120.0" y="250.0"></omgdi:waypoint>
+        <omgdi:waypoint x="530.5" y="275.0"></omgdi:waypoint>
+        <omgdi:waypoint x="950.0" y="275.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2116D691-BD6C-4ABA-9346-27611BD512E7" id="BPMNEdge_sid-2116D691-BD6C-4ABA-9346-27611BD512E7">
         <omgdi:waypoint x="685.0" y="178.27624309392297"></omgdi:waypoint>
         <omgdi:waypoint x="705.3888888888888" y="178.38888888888934"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-E6FDDF2A-D792-4586-8072-D7BCBE3A9B04" id="BPMNEdge_sid-E6FDDF2A-D792-4586-8072-D7BCBE3A9B04">
+        <omgdi:waypoint x="451.01784037558684" y="275.48215962441316"></omgdi:waypoint>
+        <omgdi:waypoint x="950.00000660004" y="275.0140712883677"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" id="BPMNEdge_sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8">
         <omgdi:waypoint x="916.0" y="178.28936170212768"></omgdi:waypoint>
         <omgdi:waypoint x="945.4145299145299" y="178.4145299145299"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-503EEA60-EC8C-4130-8B49-BC1A3275FEE4" id="BPMNEdge_sid-503EEA60-EC8C-4130-8B49-BC1A3275FEE4">
-        <omgdi:waypoint x="355.0" y="250.0"></omgdi:waypoint>
-        <omgdi:waypoint x="431.5" y="250.0"></omgdi:waypoint>
-        <omgdi:waypoint x="431.5" y="217.5"></omgdi:waypoint>
+        <omgdi:waypoint x="355.0" y="275.1968503937008"></omgdi:waypoint>
+        <omgdi:waypoint x="411.9209486166008" y="275.4209486166008"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-A26EFFF7-C36E-4B34-9AF1-7FF4645F64BC" id="BPMNEdge_sid-A26EFFF7-C36E-4B34-9AF1-7FF4645F64BC">
         <omgdi:waypoint x="744.5778688524591" y="178.42213114754145"></omgdi:waypoint>
         <omgdi:waypoint x="780.0" y="178.27755102040848"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-29ABB88A-6AC9-4765-A254-F03E0F2173DB" id="BPMNEdge_sid-29ABB88A-6AC9-4765-A254-F03E0F2173DB">
+        <omgdi:waypoint x="431.89690721649487" y="255.39690721649484"></omgdi:waypoint>
+        <omgdi:waypoint x="431.7025641025641" y="217.5"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FF876226-1C90-40F2-B4E3-62947A248E25" id="BPMNEdge_sid-FF876226-1C90-40F2-B4E3-62947A248E25">
-        <omgdi:waypoint x="965.344262295082" y="197.65573770491804"></omgdi:waypoint>
-        <omgdi:waypoint x="965.1219471893326" y="225.00049571209084"></omgdi:waypoint>
+        <omgdi:waypoint x="965.4010416666666" y="197.59895833333334"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0777191640226" y="260.0002013436332"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-1A93F85B-6DDE-4990-8984-F7988C654D15" id="BPMNEdge_sid-1A93F85B-6DDE-4990-8984-F7988C654D15">
-        <omgdi:waypoint x="95.5" y="145.5"></omgdi:waypoint>
+        <omgdi:waypoint x="95.5" y="165.5"></omgdi:waypoint>
         <omgdi:waypoint x="95.5" y="115.0"></omgdi:waypoint>
         <omgdi:waypoint x="165.0" y="115.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-D807CB4A-C586-4F6B-ACED-D78F344DF6E4" id="BPMNEdge_sid-D807CB4A-C586-4F6B-ACED-D78F344DF6E4">
-        <omgdi:waypoint x="44.99956298163057" y="165.1145004807758"></omgdi:waypoint>
-        <omgdi:waypoint x="75.34615384615384" y="165.34615384615384"></omgdi:waypoint>
+        <omgdi:waypoint x="44.99956298163057" y="185.1145004807758"></omgdi:waypoint>
+        <omgdi:waypoint x="75.34615384615384" y="185.34615384615384"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-91D827C5-38C6-4122-99E9-F28483D48060" id="BPMNEdge_sid-91D827C5-38C6-4122-99E9-F28483D48060">
-        <omgdi:waypoint x="220.0" y="250.0"></omgdi:waypoint>
-        <omgdi:waypoint x="255.0" y="250.0"></omgdi:waypoint>
+        <omgdi:waypoint x="220.0" y="278.14814814814815"></omgdi:waypoint>
+        <omgdi:waypoint x="255.0" y="276.85185185185185"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 50 - 33
src/main/resources/processes/oil_second_enuser_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_second_enuser_append_apply" name="oil_second_enuser_append_apply" isExecutable="true">
-    <documentation>二级物资企业用户增项审批流程</documentation>
+    <documentation>二级物资企业用户增项审批流程(分布退回)</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
     <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
     <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="业务处室专业审批" activiti:candidateUsers="${users}"></userTask>
@@ -16,7 +16,6 @@
     <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
     <userTask id="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" name="业务处室接收" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></sequenceFlow>
     <endEvent id="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7"></endEvent>
@@ -36,12 +35,6 @@
     <sequenceFlow id="sid-DD6F40DE-1FEE-48B8-9C82-B0DB4A30707B" name="不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <exclusiveGateway id="sid-FAC5327F-AF9F-4F83-B30A-06493AA56001"></exclusiveGateway>
     <sequenceFlow id="sid-57A0B20A-0C51-48BB-97E0-941D68071C05" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-FAC5327F-AF9F-4F83-B30A-06493AA56001"></sequenceFlow>
     <userTask id="sid-C2B2FB52-5460-4844-B607-D625C2DDD85E" name="供方申请" activiti:assignee="${recorder}">
@@ -56,14 +49,28 @@
     <sequenceFlow id="sid-FBA3F815-EF66-4C00-B00E-556CCA9E9E3C" name="二级单位代办" sourceRef="sid-FAC5327F-AF9F-4F83-B30A-06493AA56001" targetRef="sid-C2B2FB52-5460-4844-B607-D625C2DDD85E">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
+    <exclusiveGateway id="sid-1FD4F48A-463F-4EE2-9CDA-0787BBC9202F"></exclusiveGateway>
+    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-C332F839-A289-4CA1-A4AD-B2A49B1E105A" name="不通过" sourceRef="sid-1FD4F48A-463F-4EE2-9CDA-0787BBC9202F" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-105E23FB-226A-4F99-9157-11E856F38922" name="通过" sourceRef="sid-1FD4F48A-463F-4EE2-9CDA-0787BBC9202F" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-1FD4F48A-463F-4EE2-9CDA-0787BBC9202F"></sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_second_enuser_append_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_second_enuser_append_apply" id="BPMNPlane_oil_second_enuser_append_apply">
       <bpmndi:BPMNShape bpmnElement="sid-9A4918D7-8376-4A00-928A-6415D92565EC" id="BPMNShape_sid-9A4918D7-8376-4A00-928A-6415D92565EC">
-        <omgdc:Bounds height="30.0" width="30.0" x="75.0" y="280.0"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="75.0" y="290.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" id="BPMNShape_sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-        <omgdc:Bounds height="79.99999999999994" width="100.0" x="330.0" y="335.00000000000017"></omgdc:Bounds>
+        <omgdc:Bounds height="79.99999999999994" width="100.0" x="330.0" y="355.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" id="BPMNShape_sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
         <omgdc:Bounds height="80.0" width="100.0" x="990.0" y="255.0000000000001"></omgdc:Bounds>
@@ -90,17 +97,20 @@
         <omgdc:Bounds height="28.0" width="28.0" x="1185.0" y="281.0000000000001"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-8988B359-05F0-4FF6-8910-B395ED0BFA1F" id="BPMNShape_sid-8988B359-05F0-4FF6-8910-B395ED0BFA1F">
-        <omgdc:Bounds height="80.0" width="100.0" x="180.0" y="335.0000000000001"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="180.0" y="355.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB" id="BPMNShape_sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
-        <omgdc:Bounds height="30.0" width="30.0" x="1115.0" y="360.00000000000017"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="1115.0" y="380.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-FAC5327F-AF9F-4F83-B30A-06493AA56001" id="BPMNShape_sid-FAC5327F-AF9F-4F83-B30A-06493AA56001">
-        <omgdc:Bounds height="40.0" width="40.0" x="135.0" y="275.00000000000006"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="135.0" y="285.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-C2B2FB52-5460-4844-B607-D625C2DDD85E" id="BPMNShape_sid-C2B2FB52-5460-4844-B607-D625C2DDD85E">
         <omgdc:Bounds height="80.0" width="100.0" x="285.0" y="195.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-1FD4F48A-463F-4EE2-9CDA-0787BBC9202F" id="BPMNShape_sid-1FD4F48A-463F-4EE2-9CDA-0787BBC9202F">
+        <omgdc:Bounds height="40.0" width="40.0" x="510.0" y="375.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
         <omgdi:waypoint x="1090.0" y="295.0000000000001"></omgdi:waypoint>
         <omgdi:waypoint x="1110.0" y="295.00000000000006"></omgdi:waypoint>
@@ -110,21 +120,20 @@
         <omgdi:waypoint x="1185.0003729405028" y="295.1021870588285"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-DD6F40DE-1FEE-48B8-9C82-B0DB4A30707B" id="BPMNEdge_sid-DD6F40DE-1FEE-48B8-9C82-B0DB4A30707B">
-        <omgdi:waypoint x="1130.379746835443" y="314.620253164557"></omgdi:waypoint>
-        <omgdi:waypoint x="1130.0943377568763" y="360.00029665667944"></omgdi:waypoint>
+        <omgdi:waypoint x="1130.4040404040404" y="314.59595959595964"></omgdi:waypoint>
+        <omgdi:waypoint x="1130.0753759327358" y="380.0001893855701"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-57A0B20A-0C51-48BB-97E0-941D68071C05" id="BPMNEdge_sid-57A0B20A-0C51-48BB-97E0-941D68071C05">
-        <omgdi:waypoint x="104.99956298163058" y="295.1145004807758"></omgdi:waypoint>
-        <omgdi:waypoint x="135.34615384615384" y="295.34615384615387"></omgdi:waypoint>
+        <omgdi:waypoint x="104.99956298163058" y="305.1145004807758"></omgdi:waypoint>
+        <omgdi:waypoint x="135.34615384615384" y="305.34615384615387"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
         <omgdi:waypoint x="580.0" y="295.0"></omgdi:waypoint>
         <omgdi:waypoint x="600.0" y="295.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
-        <omgdi:waypoint x="430.0" y="375.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="530.0" y="375.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="530.0" y="335.0"></omgdi:waypoint>
+        <omgdi:waypoint x="430.0" y="395.16611295681065"></omgdi:waypoint>
+        <omgdi:waypoint x="510.43333333333334" y="395.43333333333334"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-19C58F45-7C70-488E-8D7D-CD770501895F" id="BPMNEdge_sid-19C58F45-7C70-488E-8D7D-CD770501895F">
         <omgdi:waypoint x="385.0" y="235.0"></omgdi:waypoint>
@@ -135,41 +144,49 @@
         <omgdi:waypoint x="639.5913461538462" y="295.40865384615387"></omgdi:waypoint>
         <omgdi:waypoint x="675.0" y="295.23923444976083"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C332F839-A289-4CA1-A4AD-B2A49B1E105A" id="BPMNEdge_sid-C332F839-A289-4CA1-A4AD-B2A49B1E105A">
+        <omgdi:waypoint x="549.5158597662771" y="395.4841402337229"></omgdi:waypoint>
+        <omgdi:waypoint x="1115.0000052170221" y="395.01251042100336"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" id="BPMNEdge_sid-22C499F4-7179-4558-BC4C-77EF7453FA56">
         <omgdi:waypoint x="970.0" y="295.0000000000001"></omgdi:waypoint>
         <omgdi:waypoint x="990.0" y="295.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-73EFDDF4-5B80-4056-B6FC-15B868734F3F" id="BPMNEdge_sid-73EFDDF4-5B80-4056-B6FC-15B868734F3F">
-        <omgdi:waypoint x="280.0" y="375.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="330.0" y="375.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="280.0" y="395.0"></omgdi:waypoint>
+        <omgdi:waypoint x="330.0" y="395.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-105E23FB-226A-4F99-9157-11E856F38922" id="BPMNEdge_sid-105E23FB-226A-4F99-9157-11E856F38922">
+        <omgdi:waypoint x="530.4" y="375.4"></omgdi:waypoint>
+        <omgdi:waypoint x="530.1990049751244" y="335.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
         <omgdi:waypoint x="834.5913461538462" y="295.408653846154"></omgdi:waypoint>
         <omgdi:waypoint x="870.0" y="295.2392344497609"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
-        <omgdi:waypoint x="620.5" y="314.5"></omgdi:waypoint>
-        <omgdi:waypoint x="620.5" y="375.00000000000017"></omgdi:waypoint>
-        <omgdi:waypoint x="1115.0" y="375.00000000000017"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FBA3F815-EF66-4C00-B00E-556CCA9E9E3C" id="BPMNEdge_sid-FBA3F815-EF66-4C00-B00E-556CCA9E9E3C">
-        <omgdi:waypoint x="155.5" y="275.50000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="155.5" y="285.5"></omgdi:waypoint>
         <omgdi:waypoint x="155.5" y="235.0"></omgdi:waypoint>
         <omgdi:waypoint x="285.0" y="235.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
+        <omgdi:waypoint x="620.5" y="314.5"></omgdi:waypoint>
+        <omgdi:waypoint x="620.5" y="395.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1115.0" y="395.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
         <omgdi:waypoint x="774.9999999999999" y="295.00000000000017"></omgdi:waypoint>
         <omgdi:waypoint x="794.9999999999999" y="295.0000000000002"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
         <omgdi:waypoint x="815.0" y="315.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="815.0" y="375.00000000000017"></omgdi:waypoint>
-        <omgdi:waypoint x="1115.0" y="375.00000000000017"></omgdi:waypoint>
+        <omgdi:waypoint x="815.0" y="395.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1115.0" y="395.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C62C4AF2-1740-43DF-ABC7-460CC1C8DA95" id="BPMNEdge_sid-C62C4AF2-1740-43DF-ABC7-460CC1C8DA95">
-        <omgdi:waypoint x="155.5" y="314.50000000000006"></omgdi:waypoint>
-        <omgdi:waypoint x="155.5" y="375.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="180.0" y="375.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="155.5" y="324.5"></omgdi:waypoint>
+        <omgdi:waypoint x="155.5" y="395.0"></omgdi:waypoint>
+        <omgdi:waypoint x="180.0" y="395.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 41 - 24
src/main/resources/processes/oil_second_enuser_supplier_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_second_enuser_supplier_apply" name="oil_second_enuser_supplier_apply" isExecutable="true">
-    <documentation>二级物资企业用户准入审批流程</documentation>
+    <documentation>二级物资准入审批流程</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
     <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
     <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="业务处室专业审批" activiti:candidateUsers="${users}"></userTask>
@@ -16,7 +16,7 @@
     <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF"></sequenceFlow>
+    <sequenceFlow id="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-966FE1B9-D563-43DE-9686-F19651CEBC0A"></sequenceFlow>
     <userTask id="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" name="业务处室接收" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></sequenceFlow>
     <endEvent id="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7"></endEvent>
@@ -36,12 +36,6 @@
     <sequenceFlow id="sid-DD6F40DE-1FEE-48B8-9C82-B0DB4A30707B" name="不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
-    </sequenceFlow>
     <exclusiveGateway id="sid-223B9EF2-EE3E-4E74-BA41-310A81333F8B"></exclusiveGateway>
     <sequenceFlow id="sid-D36CA686-A0BD-4595-8B81-674FF82AD33E" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-223B9EF2-EE3E-4E74-BA41-310A81333F8B"></sequenceFlow>
     <userTask id="sid-36443CBA-4DD9-47AD-B915-D4649B2B2A80" name="供方申请" activiti:assignee="${recorder}">
@@ -56,6 +50,19 @@
     <sequenceFlow id="sid-9E6DFD00-F76E-4FED-B342-402D962E8E95" name="企业用户申请" sourceRef="sid-223B9EF2-EE3E-4E74-BA41-310A81333F8B" targetRef="sid-8988B359-05F0-4FF6-8910-B395ED0BFA1F">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" name="通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <exclusiveGateway id="sid-966FE1B9-D563-43DE-9686-F19651CEBC0A"></exclusiveGateway>
+    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-9442390E-C4CC-4F7C-A664-CE6DD7E50CB6" name="不通过" sourceRef="sid-966FE1B9-D563-43DE-9686-F19651CEBC0A" targetRef="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-03E5F033-66C4-4EA7-BA9B-45FE0A8A735B" name="通过" sourceRef="sid-966FE1B9-D563-43DE-9686-F19651CEBC0A" targetRef="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_second_enuser_supplier_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_second_enuser_supplier_apply" id="BPMNPlane_oil_second_enuser_supplier_apply">
@@ -63,7 +70,7 @@
         <omgdc:Bounds height="30.0" width="30.0" x="60.0" y="280.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" id="BPMNShape_sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-        <omgdc:Bounds height="79.99999999999994" width="100.0" x="330.0" y="335.00000000000017"></omgdc:Bounds>
+        <omgdc:Bounds height="79.99999999999994" width="100.0" x="330.0" y="340.00000000000006"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" id="BPMNShape_sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
         <omgdc:Bounds height="80.00000000000003" width="100.0" x="975.0" y="254.99999999999997"></omgdc:Bounds>
@@ -93,7 +100,7 @@
         <omgdc:Bounds height="79.99999999999994" width="100.0" x="195.0" y="335.00000000000017"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB" id="BPMNShape_sid-D718B3DA-E003-4A00-B3FA-4D32985377BB">
-        <omgdc:Bounds height="30.0" width="30.0" x="1115.0" y="360.00000000000017"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="1115.0" y="365.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-223B9EF2-EE3E-4E74-BA41-310A81333F8B" id="BPMNShape_sid-223B9EF2-EE3E-4E74-BA41-310A81333F8B">
         <omgdc:Bounds height="40.0" width="40.0" x="135.0" y="275.0000000000001"></omgdc:Bounds>
@@ -101,6 +108,9 @@
       <bpmndi:BPMNShape bpmnElement="sid-36443CBA-4DD9-47AD-B915-D4649B2B2A80" id="BPMNShape_sid-36443CBA-4DD9-47AD-B915-D4649B2B2A80">
         <omgdc:Bounds height="80.0" width="100.0" x="285.0" y="195.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-966FE1B9-D563-43DE-9686-F19651CEBC0A" id="BPMNShape_sid-966FE1B9-D563-43DE-9686-F19651CEBC0A">
+        <omgdc:Bounds height="40.0" width="40.0" x="480.0" y="360.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
         <omgdi:waypoint x="1075.0" y="295.0"></omgdi:waypoint>
         <omgdi:waypoint x="1110.0" y="295.0"></omgdi:waypoint>
@@ -110,33 +120,36 @@
         <omgdi:waypoint x="1185.0003729405028" y="295.10218705882846"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-DD6F40DE-1FEE-48B8-9C82-B0DB4A30707B" id="BPMNEdge_sid-DD6F40DE-1FEE-48B8-9C82-B0DB4A30707B">
-        <omgdi:waypoint x="1130.379746835443" y="314.62025316455697"></omgdi:waypoint>
-        <omgdi:waypoint x="1130.0943377568763" y="360.00029665667944"></omgdi:waypoint>
+        <omgdi:waypoint x="1130.3869047619048" y="314.61309523809524"></omgdi:waypoint>
+        <omgdi:waypoint x="1130.088755842669" y="365.000262588952"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
         <omgdi:waypoint x="550.0" y="295.00000000000006"></omgdi:waypoint>
         <omgdi:waypoint x="570.0" y="295.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
-        <omgdi:waypoint x="430.0" y="375.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="500.0" y="375.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="500.0" y="335.0"></omgdi:waypoint>
+        <omgdi:waypoint x="430.0" y="380.20746887966806"></omgdi:waypoint>
+        <omgdi:waypoint x="480.4166666666667" y="380.4166666666667"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
-        <omgdi:waypoint x="609.5913461538462" y="295.4086538461539"></omgdi:waypoint>
-        <omgdi:waypoint x="645.0" y="295.23923444976083"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-03E5F033-66C4-4EA7-BA9B-45FE0A8A735B" id="BPMNEdge_sid-03E5F033-66C4-4EA7-BA9B-45FE0A8A735B">
+        <omgdi:waypoint x="500.38235294117646" y="360.38235294117646"></omgdi:waypoint>
+        <omgdi:waypoint x="500.233918128655" y="335.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-D36CA686-A0BD-4595-8B81-674FF82AD33E" id="BPMNEdge_sid-D36CA686-A0BD-4595-8B81-674FF82AD33E">
         <omgdi:waypoint x="89.99971066768252" y="295.0931659047682"></omgdi:waypoint>
         <omgdi:waypoint x="135.37499999999997" y="295.3750000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
+        <omgdi:waypoint x="609.5913461538462" y="295.4086538461539"></omgdi:waypoint>
+        <omgdi:waypoint x="645.0" y="295.23923444976083"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" id="BPMNEdge_sid-22C499F4-7179-4558-BC4C-77EF7453FA56">
         <omgdi:waypoint x="955.0" y="295.0"></omgdi:waypoint>
         <omgdi:waypoint x="975.0" y="295.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-73EFDDF4-5B80-4056-B6FC-15B868734F3F" id="BPMNEdge_sid-73EFDDF4-5B80-4056-B6FC-15B868734F3F">
-        <omgdi:waypoint x="295.0" y="375.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="330.0" y="375.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="295.0" y="376.85185185185196"></omgdi:waypoint>
+        <omgdi:waypoint x="330.0" y="378.1481481481482"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
         <omgdi:waypoint x="819.5913461538462" y="295.4086538461539"></omgdi:waypoint>
@@ -144,8 +157,12 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
         <omgdi:waypoint x="590.5" y="314.5000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="590.5" y="375.00000000000017"></omgdi:waypoint>
-        <omgdi:waypoint x="1115.0" y="375.00000000000017"></omgdi:waypoint>
+        <omgdi:waypoint x="590.5" y="380.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1115.0" y="380.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-9442390E-C4CC-4F7C-A664-CE6DD7E50CB6" id="BPMNEdge_sid-9442390E-C4CC-4F7C-A664-CE6DD7E50CB6">
+        <omgdi:waypoint x="519.5151033386328" y="380.48489666136726"></omgdi:waypoint>
+        <omgdi:waypoint x="1115.000004731617" y="380.0119142138748"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-39B4F0A7-F607-4FDC-B413-389057E0E52C" id="BPMNEdge_sid-39B4F0A7-F607-4FDC-B413-389057E0E52C">
         <omgdi:waypoint x="385.0" y="235.0"></omgdi:waypoint>
@@ -163,8 +180,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
         <omgdi:waypoint x="800.0" y="315.0000000000001"></omgdi:waypoint>
-        <omgdi:waypoint x="800.0" y="375.00000000000017"></omgdi:waypoint>
-        <omgdi:waypoint x="1115.0" y="375.00000000000017"></omgdi:waypoint>
+        <omgdi:waypoint x="800.0" y="380.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1115.0" y="380.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-9E6DFD00-F76E-4FED-B342-402D962E8E95" id="BPMNEdge_sid-9E6DFD00-F76E-4FED-B342-402D962E8E95">
         <omgdi:waypoint x="155.5" y="314.5000000000001"></omgdi:waypoint>