Kaynağa Gözat

更新工作流

yuedefeng 6 yıl önce
ebeveyn
işleme
2c65783ac5

+ 2 - 1
src/main/resources/config/application-dev.yml

@@ -36,6 +36,7 @@ spring:
             indent-output: true
     datasource:
         type: com.zaxxer.hikari.HikariDataSource
+        # url: jdbc:mysql://60.30.245.229:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         url: jdbc:mysql://47.92.212.59:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         username: root
         password: zks123456
@@ -75,7 +76,7 @@ spring:
         asyncExecutorEnabled: false
         asyncExecutorActivate: false
         database-schema-update: false
-        check-process-definitions: false
+        check-process-definitions: true
         process-definition-location-prefix: classpath:/processes2/
     #    process-definition-location-suffixes:
     #      - **.bpmn

+ 11 - 14
src/main/resources/processes/oil_append_apply.bpmn20.xml

@@ -35,19 +35,19 @@
     <sequenceFlow id="sid-72FD9AD3-D8DA-4EDA-8CDA-61CA2EF18D16" name="通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-93350F57-2C3C-4BE5-B86B-16F674908E36">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" name="不通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
+    <sequenceFlow id="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" 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-EB076F5D-4399-4588-8EB7-170C1B7A7988" name="通过" sourceRef="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9" targetRef="sid-32991EA5-8FB3-47F6-82F7-349BEA73C5A9">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-6C9050FE-9203-4F9C-9C49-1B445A9D6286" name="不通过" sourceRef="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
+    <sequenceFlow id="sid-6C9050FE-9203-4F9C-9C49-1B445A9D6286" name="不通过" sourceRef="sid-0D3E025F-8031-4D24-BD9C-9E7E2A885EF9" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-910CEAE5-37F6-42A7-A4E1-4E2D6D2C2149" name="通过" sourceRef="sid-225C5747-6CFC-41AB-B244-65B397205F62" targetRef="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-C903C94C-21B7-45E3-8507-6BF9EA6DBDAC" name="不通过" sourceRef="sid-225C5747-6CFC-41AB-B244-65B397205F62" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
+    <sequenceFlow id="sid-C903C94C-21B7-45E3-8507-6BF9EA6DBDAC" name="不通过" sourceRef="sid-225C5747-6CFC-41AB-B244-65B397205F62" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
   </process>
@@ -113,10 +113,9 @@
         <omgdi:waypoint x="555.3214285714287" y="175.3214285714287"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-6C9050FE-9203-4F9C-9C49-1B445A9D6286" id="BPMNEdge_sid-6C9050FE-9203-4F9C-9C49-1B445A9D6286">
-        <omgdi:waypoint x="575.5000000000001" y="194.50000000000017"></omgdi:waypoint>
-        <omgdi:waypoint x="575.5000000000001" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="140.0" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="140.0" y="215.00000000000003"></omgdi:waypoint>
+        <omgdi:waypoint x="575.5000000000001" y="194.50000000000014"></omgdi:waypoint>
+        <omgdi:waypoint x="575.5000000000002" y="240.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1100.0000000000005" y="240.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" id="BPMNEdge_sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8">
         <omgdi:waypoint x="1060.0" y="175.23696682464464"></omgdi:waypoint>
@@ -128,9 +127,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" id="BPMNEdge_sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB">
         <omgdi:waypoint x="365.50000000000006" y="194.50000000000006"></omgdi:waypoint>
-        <omgdi:waypoint x="365.50000000000006" y="236.0"></omgdi:waypoint>
-        <omgdi:waypoint x="140.0" y="236.0"></omgdi:waypoint>
-        <omgdi:waypoint x="140.0" y="215.00000000000003"></omgdi:waypoint>
+        <omgdi:waypoint x="365.50000000000006" y="240.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1100.0000000000005" y="240.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C2AD6A34-7DF1-4265-A861-851823391728" id="BPMNEdge_sid-C2AD6A34-7DF1-4265-A861-851823391728">
         <omgdi:waypoint x="850.0000000000001" y="175.2369668246447"></omgdi:waypoint>
@@ -141,10 +139,9 @@
         <omgdi:waypoint x="750.0000000000001" y="175.00000000000006"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C903C94C-21B7-45E3-8507-6BF9EA6DBDAC" id="BPMNEdge_sid-C903C94C-21B7-45E3-8507-6BF9EA6DBDAC">
-        <omgdi:waypoint x="905.5000000000001" y="155.50000000000023"></omgdi:waypoint>
-        <omgdi:waypoint x="905.5000000000001" y="81.99999618530275"></omgdi:waypoint>
-        <omgdi:waypoint x="140.0" y="81.99999618530275"></omgdi:waypoint>
-        <omgdi:waypoint x="140.0" y="135.00000000000003"></omgdi:waypoint>
+        <omgdi:waypoint x="905.5000000000001" y="194.5000000000002"></omgdi:waypoint>
+        <omgdi:waypoint x="905.5000000000002" y="240.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1100.0000000000005" y="240.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52" id="BPMNEdge_sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52">
         <omgdi:waypoint x="50.00000000000001" y="175.0000000000001"></omgdi:waypoint>

+ 56 - 29
src/main/resources/processes/oil_audit_apply.bpmn20.xml

@@ -18,18 +18,27 @@
     <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-DA1BD531-293F-4233-8F81-E929521E498E" name="业务处室专业审核" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-6859CEC6-ACF1-44CD-9F6D-E2A069698817" sourceRef="sid-DA1BD531-293F-4233-8F81-E929521E498E" targetRef="sid-83F82DD8-F857-4908-9A4C-6C62A42F5207"></sequenceFlow>
+    <sequenceFlow id="sid-B68E8B23-15DA-47EB-837B-9830D40B9696" sourceRef="sid-83F82DD8-F857-4908-9A4C-6C62A42F5207" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <userTask id="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" name="业务处室接收" activiti:candidateUsers="${users}"></userTask>
+    <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-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" sourceRef="sid-83F82DD8-F857-4908-9A4C-6C62A42F5207" targetRef="sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B">
       <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-F5587778-2194-43BD-B5A9-23041685B24E">
+    <sequenceFlow id="sid-D41C626E-114D-42A3-A121-9FE3A9F16096" sourceRef="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" targetRef="sid-DA1BD531-293F-4233-8F81-E929521E498E"></sequenceFlow>
+    <sequenceFlow id="sid-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-B68E8B23-15DA-47EB-837B-9830D40B9696" sourceRef="sid-83F82DD8-F857-4908-9A4C-6C62A42F5207" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
+    <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>
-    <userTask id="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" name="业务处室接收" activiti:candidateUsers="${users}"></userTask>
-    <sequenceFlow id="sid-D41C626E-114D-42A3-A121-9FE3A9F16096" sourceRef="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" targetRef="sid-DA1BD531-293F-4233-8F81-E929521E498E"></sequenceFlow>
-    <sequenceFlow id="sid-E8D1F6DC-4AE2-413C-84CC-F3A4591CAE8A" name="通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956">
+    <sequenceFlow id="sid-388CA9A5-465E-4390-A925-7A535A689BF1" name="通过" sourceRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" targetRef="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></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>
   </process>
@@ -42,63 +51,81 @@
         <omgdc:Bounds height="80.0" width="100.0" x="95.0" y="138.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-83F82DD8-F857-4908-9A4C-6C62A42F5207" id="BPMNShape_sid-83F82DD8-F857-4908-9A4C-6C62A42F5207">
-        <omgdc:Bounds height="40.0" width="40.0" x="735.0000000000001" y="155.00000000000006"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="960.0000000000001" y="158.0000000000003"></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.0000000000002" y="161.00000000000009"></omgdc:Bounds>
+        <omgdc:Bounds height="28.0" width="28.0" x="1035.0000000000002" y="161.0000000000001"></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="740.0000000000003" y="225.00000000000003"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="965.0000000000002" y="225.00000000000009"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D5765623-E20C-4774-9303-488697382FC8" id="BPMNShape_sid-D5765623-E20C-4774-9303-488697382FC8">
         <omgdc:Bounds height="80.0" width="99.99999999999997" x="240.00000000000003" y="138.00000000000017"></omgdc:Bounds>
       </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="375.0000000000001" y="158.0000000000002"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="375.0000000000001" y="158.00000000000003"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-DA1BD531-293F-4233-8F81-E929521E498E" id="BPMNShape_sid-DA1BD531-293F-4233-8F81-E929521E498E">
-        <omgdc:Bounds height="80.0" width="120.99999999999989" x="585.0000000000001" y="138.00000000000026"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="120.99999999999989" x="795.0000000000001" y="138.00000000000034"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956" id="BPMNShape_sid-B1D73BE1-9FB5-49F5-8A48-5B7A60F8E956">
-        <omgdc:Bounds height="80.0" width="99.99999999999994" x="450.00000000000006" y="138.00000000000028"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="99.99999999999989" x="660.0000000000001" y="138.00000000000037"></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="99.99999999999994" x="450.00000000000006" y="138.00000000000003"></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="585.0000000000001" y="158.0000000000004"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-6859CEC6-ACF1-44CD-9F6D-E2A069698817" id="BPMNEdge_sid-6859CEC6-ACF1-44CD-9F6D-E2A069698817">
-        <omgdi:waypoint x="706.0" y="177.94034707158374"></omgdi:waypoint>
-        <omgdi:waypoint x="736.4396729937984" y="176.4396729937983"></omgdi:waypoint>
+        <omgdi:waypoint x="916.0" y="178.00920712220397"></omgdi:waypoint>
+        <omgdi:waypoint x="960.3466492869193" y="178.3466492869195"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" id="BPMNEdge_sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163">
-        <omgdi:waypoint x="395.5555419921876" y="197.4444580078127"></omgdi:waypoint>
-        <omgdi:waypoint x="395.5555419921876" y="242.0"></omgdi:waypoint>
-        <omgdi:waypoint x="145.0" y="242.0"></omgdi:waypoint>
-        <omgdi:waypoint x="145.0" y="218.0"></omgdi:waypoint>
+        <omgdi:waypoint x="395.5555419921876" y="197.44445800781253"></omgdi:waypoint>
+        <omgdi:waypoint x="395.5555419921876" y="240.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0000000000002" y="240.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" id="BPMNEdge_sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D">
-        <omgdi:waypoint x="774.6144578313254" y="175.38554216867476"></omgdi:waypoint>
-        <omgdi:waypoint x="825.0002509882665" y="175.08383083240568"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" id="BPMNEdge_sid-0F7FB010-0A59-4862-8046-36C4B320FB28">
+        <omgdi:waypoint x="605.5000000000001" y="197.50000000000037"></omgdi:waypoint>
+        <omgdi:waypoint x="605.5000000000002" y="240.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0000000000002" y="240.00000000000009"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-E8D1F6DC-4AE2-413C-84CC-F3A4591CAE8A" id="BPMNEdge_sid-E8D1F6DC-4AE2-413C-84CC-F3A4591CAE8A">
-        <omgdi:waypoint x="414.59134615384625" y="178.40865384615407"></omgdi:waypoint>
-        <omgdi:waypoint x="450.00000000000006" y="178.239234449761"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-388CA9A5-465E-4390-A925-7A535A689BF1" id="BPMNEdge_sid-388CA9A5-465E-4390-A925-7A535A689BF1">
+        <omgdi:waypoint x="624.5913461538463" y="178.40865384615424"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0000000000001" y="178.23923444976114"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" id="BPMNEdge_sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A">
+        <omgdi:waypoint x="550.0" y="178.23696682464475"></omgdi:waypoint>
+        <omgdi:waypoint x="585.4047619047619" y="178.40476190476224"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" id="BPMNEdge_sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D">
+        <omgdi:waypoint x="999.5277777777778" y="177.52777777777803"></omgdi:waypoint>
+        <omgdi:waypoint x="1035.0182391101466" y="175.7143965418175"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" id="BPMNEdge_sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46">
-        <omgdi:waypoint x="340.0" y="178.23696682464475"></omgdi:waypoint>
-        <omgdi:waypoint x="375.40476190476204" y="178.4047619047621"></omgdi:waypoint>
+        <omgdi:waypoint x="340.0" y="178.23696682464464"></omgdi:waypoint>
+        <omgdi:waypoint x="375.40476190476204" y="178.40476190476195"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52" id="BPMNEdge_sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52">
         <omgdi:waypoint x="50.0" y="178.0"></omgdi:waypoint>
         <omgdi:waypoint x="95.0" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-D41C626E-114D-42A3-A121-9FE3A9F16096" id="BPMNEdge_sid-D41C626E-114D-42A3-A121-9FE3A9F16096">
-        <omgdi:waypoint x="550.0" y="178.00000000000028"></omgdi:waypoint>
-        <omgdi:waypoint x="585.0000000000001" y="178.00000000000028"></omgdi:waypoint>
+        <omgdi:waypoint x="760.0" y="178.00000000000034"></omgdi:waypoint>
+        <omgdi:waypoint x="795.0000000000001" y="178.00000000000034"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-BCE3633B-A666-47A5-A005-216CF9EBBA95" id="BPMNEdge_sid-BCE3633B-A666-47A5-A005-216CF9EBBA95">
         <omgdi:waypoint x="195.0" y="178.00000000000006"></omgdi:waypoint>
         <omgdi:waypoint x="240.00000000000003" y="178.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-B68E8B23-15DA-47EB-837B-9830D40B9696" id="BPMNEdge_sid-B68E8B23-15DA-47EB-837B-9830D40B9696">
-        <omgdi:waypoint x="755.5000000000001" y="194.50000000000003"></omgdi:waypoint>
-        <omgdi:waypoint x="755.5000000000002" y="216.5000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="980.5000000000001" y="197.5000000000003"></omgdi:waypoint>
+        <omgdi:waypoint x="980.5000000000001" y="216.50000000000017"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-002682E5-FF90-4A74-8707-0F8B98C09674" id="BPMNEdge_sid-002682E5-FF90-4A74-8707-0F8B98C09674">
+        <omgdi:waypoint x="414.59134615384625" y="178.40865384615387"></omgdi:waypoint>
+        <omgdi:waypoint x="450.00000000000006" y="178.2392344497608"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 167 - 0
src/main/resources/processes/oil_enuser_supplier_apply.bpmn20.xml

@@ -0,0 +1,167 @@
+<?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>
+    <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>
+    <exclusiveGateway id="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></exclusiveGateway>
+    <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="二级单位复审" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
+    <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
+    <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
+    <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>
+    <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>
+    </sequenceFlow>
+    <userTask id="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E" 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-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </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-C3D25850-602F-4EB4-ACB0-28802630A689" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E"></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-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">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" name="不通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <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>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_oil_enuser_supplier_apply">
+    <bpmndi:BPMNPlane bpmnElement="oil_enuser_supplier_apply" id="BPMNPlane_oil_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="15.000000000000002" y="284.9999973509048"></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.99999999999997" width="99.99999999999997" x="210.00000000000003" y="255.00000000000003"></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="840.0000000000001" y="259.9999973509052"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" id="BPMNShape_sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
+        <omgdc:Bounds height="40.0" width="40.0" x="975.0000000000001" y="279.9999973509047"></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.99999999999997" width="99.99999999999989" x="525.0000000000001" y="255.00000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-E178BD57-68C0-4C23-8952-143905257209" id="BPMNShape_sid-E178BD57-68C0-4C23-8952-143905257209">
+        <omgdc:Bounds height="40.0" width="40.0" x="645.0000000000001" y="279.99999735090523"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" id="BPMNShape_sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+        <omgdc:Bounds height="79.99999999999997" width="99.99999999999994" x="330.00000000000006" y="255.00000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" id="BPMNShape_sid-C9D007EC-DA5F-480E-A280-EBF70615C514">
+        <omgdc:Bounds height="40.0" width="40.0" x="450.00000000000006" y="279.9999973509048"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" id="BPMNShape_sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3">
+        <omgdc:Bounds height="80.0" width="100.00000000000023" x="1050.0000000000002" y="259.999997350905"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" id="BPMNShape_sid-025875DE-EAC2-4FBC-B4A4-91377D669895">
+        <omgdc:Bounds height="40.0" width="40.0" x="1185.0000000000002" y="279.9999973509047"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D" id="BPMNShape_sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+        <omgdc:Bounds height="28.0" width="28.0" x="1260.0000000000002" y="285.9999973509047"></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="1190.0000000000005" y="375.0000000000001"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" id="BPMNShape_sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
+        <omgdc:Bounds height="80.0" width="100.0" x="720.0000000000001" y="259.9999973509051"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E" id="BPMNShape_sid-F49D476A-2CDD-4A35-8212-D88BA71F604E">
+        <omgdc:Bounds height="79.99999999999997" width="99.99999999999999" x="75.00000000000001" y="255.00000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
+        <omgdi:waypoint x="940.0000000000001" y="299.9999973509049"></omgdi:waypoint>
+        <omgdi:waypoint x="975.0" y="299.9999973509048"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" id="BPMNEdge_sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C">
+        <omgdi:waypoint x="995.0000000000001" y="319.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="995.0000000000002" y="390.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1190.0000000000005" y="390.0000000000001"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" id="BPMNEdge_sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170">
+        <omgdi:waypoint x="1205.3932584301438" y="319.6067389207612"></omgdi:waypoint>
+        <omgdi:waypoint x="1205.0837975725503" y="375.00023406959855"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
+        <omgdi:waypoint x="310.0" y="295.0"></omgdi:waypoint>
+        <omgdi:waypoint x="330.00000000000006" y="295.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="430.0" y="297.77777630605823"></omgdi:waypoint>
+        <omgdi:waypoint x="451.052631050596" y="298.94736630030883"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C17BDEB5-74AD-41D3-96D4-89E5D1A42C79" id="BPMNEdge_sid-C17BDEB5-74AD-41D3-96D4-89E5D1A42C79">
+        <omgdi:waypoint x="175.0" y="295.0"></omgdi:waypoint>
+        <omgdi:waypoint x="210.00000000000003" y="295.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="489.50000045757105" y="299.49999780847577"></omgdi:waypoint>
+        <omgdi:waypoint x="525.0000000000001" y="297.63157767985876"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-80E2DC63-571F-46E0-AB37-B348B0EBE989" id="BPMNEdge_sid-80E2DC63-571F-46E0-AB37-B348B0EBE989">
+        <omgdi:waypoint x="1224.6397058823532" y="300.3602914685518"></omgdi:waypoint>
+        <omgdi:waypoint x="1260.000372940503" y="300.1021844097332"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" id="BPMNEdge_sid-22C499F4-7179-4558-BC4C-77EF7453FA56">
+        <omgdi:waypoint x="820.0000000000001" y="299.9999973509051"></omgdi:waypoint>
+        <omgdi:waypoint x="840.0000000000001" y="299.9999973509051"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
+        <omgdi:waypoint x="470.50000000000006" y="319.4999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="470.5000000000001" y="390.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1190.0000000000005" 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="684.5913461538463" y="300.40865119705904"></omgdi:waypoint>
+        <omgdi:waypoint x="720.0000000000001" y="300.23923180066595"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
+        <omgdi:waypoint x="1150.0000000000005" y="300.2369641755494"></omgdi:waypoint>
+        <omgdi:waypoint x="1185.4047619047622" y="300.4047592556667"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
+        <omgdi:waypoint x="625.0" y="298.4721860703261"></omgdi:waypoint>
+        <omgdi:waypoint x="645.1299150667471" y="299.8700822841582"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C3D25850-602F-4EB4-ACB0-28802630A689" id="BPMNEdge_sid-C3D25850-602F-4EB4-ACB0-28802630A689">
+        <omgdi:waypoint x="44.97926746191112" y="299.2116152706095"></omgdi:waypoint>
+        <omgdi:waypoint x="75.00000000000001" y="297.6315775531078"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
+        <omgdi:waypoint x="665.0000000000001" y="319.99999735090523"></omgdi:waypoint>
+        <omgdi:waypoint x="665.0000000000002" y="390.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1190.0000000000005" y="390.0000000000001"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-E19E2941-6B2A-4114-B292-5D789BA0959A" id="BPMNEdge_sid-E19E2941-6B2A-4114-B292-5D789BA0959A">
+        <omgdi:waypoint x="1014.5913461538462" y="300.40865119705865"></omgdi:waypoint>
+        <omgdi:waypoint x="1050.0000000000002" y="300.23923180066566"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

+ 19 - 21
src/main/resources/processes/oil_first_append_apply.bpmn20.xml

@@ -18,26 +18,26 @@
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>
     <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></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-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-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <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-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    <sequenceFlow 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-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-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </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-FD0572E4-B0BC-49D2-9F15-C38057F3D170" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+    <sequenceFlow id="sid-80E2DC63-571F-46E0-AB37-B348B0EBE989" name="通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" name="不通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-80E2DC63-571F-46E0-AB37-B348B0EBE989" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    <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-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>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_first_append_apply">
@@ -96,16 +96,15 @@
         <omgdi:waypoint x="205.0" y="299.9999973509048"></omgdi:waypoint>
         <omgdi:waypoint x="255.00000000000003" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
-        <omgdi:waypoint x="425.50000000000006" y="280.4999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="425.50000000000006" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="259.9999973509048"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
         <omgdi:waypoint x="654.6357142857145" y="300.3642830651908"></omgdi:waypoint>
         <omgdi:waypoint x="705.0000000000001" y="300.0070895494867"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
+        <omgdi:waypoint x="425.50000000000006" y="319.4999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="425.5000000000001" y="360.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0000000000003" y="360.00000000000006"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
         <omgdi:waypoint x="805.0000000000003" y="300.207466230573"></omgdi:waypoint>
         <omgdi:waypoint x="855.416666666667" y="300.41666401757146"></omgdi:waypoint>
@@ -116,9 +115,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
         <omgdi:waypoint x="635.0000000000002" y="319.99999735090506"></omgdi:waypoint>
-        <omgdi:waypoint x="635.0000000000002" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="339.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="635.0000000000002" y="360.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0000000000003" y="360.00000000000006"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 132 - 0
src/main/resources/processes/oil_first_enuser_supplier_apply.bpmn20.xml

@@ -0,0 +1,132 @@
+<?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>
+    <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>
+    <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
+    <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
+    <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-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-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </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-FD0572E4-B0BC-49D2-9F15-C38057F3D170" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-80E2DC63-571F-46E0-AB37-B348B0EBE989" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </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>
+      </extensionElements>
+    </userTask>
+    <sequenceFlow id="sid-2EE39891-17BB-4F1F-9D4B-8714F85CB05E" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-596FE9B9-3ABC-4D46-9775-165DD1AEE641"></sequenceFlow>
+    <sequenceFlow id="sid-91D1F045-5F6D-4F6F-9460-C67E468B8A48" sourceRef="sid-596FE9B9-3ABC-4D46-9775-165DD1AEE641" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></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="29.999999999999996" x="30.000000000000004" y="284.9999973509054"></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="99.99999999999997" x="225.00000000000003" y="259.9999973509055"></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="570.0000000000001" y="259.9999973509049"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-E178BD57-68C0-4C23-8952-143905257209" id="BPMNShape_sid-E178BD57-68C0-4C23-8952-143905257209">
+        <omgdc:Bounds height="40.0" width="40.0" x="705.0000000000001" y="279.99999735090574"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" id="BPMNShape_sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+        <omgdc:Bounds height="80.0" width="99.99999999999994" x="360.00000000000006" y="259.9999973509055"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" id="BPMNShape_sid-C9D007EC-DA5F-480E-A280-EBF70615C514">
+        <omgdc:Bounds height="40.0" width="39.99999999999994" x="495.00000000000006" y="279.9999973509056"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" id="BPMNShape_sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3">
+        <omgdc:Bounds height="80.0" width="100.00000000000023" x="780.0000000000001" y="259.9999973509057"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" id="BPMNShape_sid-025875DE-EAC2-4FBC-B4A4-91377D669895">
+        <omgdc:Bounds height="40.0" width="40.0" x="915.0000000000001" y="279.9999973509048"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D" id="BPMNShape_sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+        <omgdc:Bounds height="28.0" width="28.0" x="990.0000000000001" y="285.99999735090523"></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="920.0000000000002" y="345.0000000000001"></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="99.99999999999999" x="90.00000000000001" y="259.9999973509048"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
+        <omgdi:waypoint x="534.5913461538463" y="300.40865119705927"></omgdi:waypoint>
+        <omgdi:waypoint x="570.0000000000001" 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="190.0" y="299.999997350905"></omgdi:waypoint>
+        <omgdi:waypoint x="225.00000000000003" y="299.99999735090523"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" id="BPMNEdge_sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170">
+        <omgdi:waypoint x="935.3389830580772" y="319.66101429282764"></omgdi:waypoint>
+        <omgdi:waypoint x="935.1260459641738" y="345.0005295955186"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-80E2DC63-571F-46E0-AB37-B348B0EBE989" id="BPMNEdge_sid-80E2DC63-571F-46E0-AB37-B348B0EBE989">
+        <omgdi:waypoint x="954.6397058823529" y="300.36029146855196"></omgdi:waypoint>
+        <omgdi:waypoint x="990.0003729405029" y="300.1021844097336"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
+        <omgdi:waypoint x="460.0" y="299.9999973509056"></omgdi:waypoint>
+        <omgdi:waypoint x="495.00000000000006" 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="325.0" y="299.99999735090546"></omgdi:waypoint>
+        <omgdi:waypoint x="360.00000000000006" y="299.9999973509055"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2EE39891-17BB-4F1F-9D4B-8714F85CB05E" id="BPMNEdge_sid-2EE39891-17BB-4F1F-9D4B-8714F85CB05E">
+        <omgdi:waypoint x="60.0" y="299.9999973509053"></omgdi:waypoint>
+        <omgdi:waypoint x="90.00000000000001" y="299.9999973509051"></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.4999973509056"></omgdi:waypoint>
+        <omgdi:waypoint x="515.5" y="360.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="920.0000000000002" y="360.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="744.6727272727275" y="300.32727007817846"></omgdi:waypoint>
+        <omgdi:waypoint x="780.0000000000001" y="300.0090063599147"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
+        <omgdi:waypoint x="880.0000000000003" y="300.2369641755498"></omgdi:waypoint>
+        <omgdi:waypoint x="915.4047619047622" y="300.4047592556669"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
+        <omgdi:waypoint x="670.0" y="299.99999735090546"></omgdi:waypoint>
+        <omgdi:waypoint x="705.0" y="299.99999735090586"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
+        <omgdi:waypoint x="725.0000000000001" y="319.99999735090574"></omgdi:waypoint>
+        <omgdi:waypoint x="725.0000000000001" y="360.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="920.0000000000002" y="360.0000000000001"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

+ 13 - 15
src/main/resources/processes/oil_first_supplier_apply.bpmn20.xml

@@ -18,27 +18,27 @@
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>
     <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></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-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-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+    <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-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+    <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-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </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-FD0572E4-B0BC-49D2-9F15-C38057F3D170" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    <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-80E2DC63-571F-46E0-AB37-B348B0EBE989" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+    <sequenceFlow id="sid-80E2DC63-571F-46E0-AB37-B348B0EBE989" name="通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" name="不通过" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_first_supplier_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_first_supplier_apply" id="BPMNPlane_oil_first_supplier_apply">
@@ -97,10 +97,9 @@
         <omgdi:waypoint x="255.00000000000003" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
-        <omgdi:waypoint x="425.50000000000006" y="280.4999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="425.50000000000006" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="259.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="425.50000000000006" y="319.4999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="425.5000000000001" y="360.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0000000000003" y="360.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="654.6357142857145" y="300.3642830651908"></omgdi:waypoint>
@@ -116,9 +115,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
         <omgdi:waypoint x="635.0000000000002" y="319.99999735090506"></omgdi:waypoint>
-        <omgdi:waypoint x="635.0000000000002" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="339.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="635.0000000000002" y="360.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0000000000003" y="360.00000000000006"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 55 - 28
src/main/resources/processes/oil_info_change.bpmn20.xml

@@ -18,18 +18,27 @@
     <intermediateThrowEvent id="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F" name="未通过"></intermediateThrowEvent>
     <userTask id="sid-577C4501-C135-43AE-8EF8-8DB311E72798" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-57E7FC69-76D9-45D2-B60F-D665A28A7936" sourceRef="sid-F5587778-2194-43BD-B5A9-23041685B24E" targetRef="sid-577C4501-C135-43AE-8EF8-8DB311E72798"></sequenceFlow>
-    <sequenceFlow id="sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159">
+    <sequenceFlow id="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-CB8A153B-3D62-4EE1-B48E-603926F38CC2" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
+    <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>
-    <sequenceFlow id="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    <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-FF876226-1C90-40F2-B4E3-62947A248E25" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
+    <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>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_info_change">
     <bpmndi:BPMNPlane bpmnElement="oil_info_change" id="BPMNPlane_oil_info_change">
@@ -40,56 +49,74 @@
         <omgdc:Bounds height="80.0" width="99.99999999999999" x="90.00000000000001" y="138.00000000000037"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-9066F48C-509C-4652-B697-A7F0E400D57A" id="BPMNShape_sid-9066F48C-509C-4652-B697-A7F0E400D57A">
-        <omgdc:Bounds height="40.0" width="40.0" x="435.00000000000017" y="158.00000000000034"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="375.00000000000006" y="158.00000000000034"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159" id="BPMNShape_sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159">
-        <omgdc:Bounds height="83.0" width="136.0" x="525.0000000000001" y="136.5000000000003"></omgdc:Bounds>
+        <omgdc:Bounds height="83.0" width="136.0" x="675.0000000000001" y="136.50000000000054"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" id="BPMNShape_sid-2012FCB2-003F-4B4F-93F0-2B75C6615389">
-        <omgdc:Bounds height="40.0" width="40.0" x="705.0000000000001" y="158.0000000000003"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="855.0000000000001" y="158.0000000000005"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19" id="BPMNShape_sid-F5772351-1198-4091-B3A6-FC55ACBFEA19">
-        <omgdc:Bounds height="28.0" width="28.0" x="780.0000000000001" y="164.00000000000045"></omgdc:Bounds>
+        <omgdc:Bounds height="28.0" width="28.0" x="945.0000000000001" y="164.00000000000048"></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="710.0000000000005" y="225.00000000000026"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="860.0000000000002" y="225.00000000000028"></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="112.99999999999994" x="270.00000000000006" y="138.5000000000004"></omgdc:Bounds>
+        <omgdc:Bounds height="79.0" width="112.99999999999997" x="225.00000000000003" y="138.50000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-6FDA29DE-91D5-439A-AFF8-CE518926AEC1" id="BPMNShape_sid-6FDA29DE-91D5-439A-AFF8-CE518926AEC1">
+        <omgdc:Bounds height="80.0" width="99.99999999999994" x="460.00000000000006" y="138.00000000000034"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-3A58E678-9DAB-4D47-94DD-A87555607A9A" id="BPMNShape_sid-3A58E678-9DAB-4D47-94DD-A87555607A9A">
+        <omgdc:Bounds height="40.0" width="40.0" x="600.0000000000002" y="158.00000000000057"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-CB8A153B-3D62-4EE1-B48E-603926F38CC2" id="BPMNEdge_sid-CB8A153B-3D62-4EE1-B48E-603926F38CC2">
-        <omgdi:waypoint x="455.5000000000002" y="197.50000000000028"></omgdi:waypoint>
-        <omgdi:waypoint x="455.5000000000002" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="140.0" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="140.0" y="218.00000000000037"></omgdi:waypoint>
+        <omgdi:waypoint x="395.5000000000001" y="197.50000000000028"></omgdi:waypoint>
+        <omgdi:waypoint x="395.5000000000001" y="240.00000000000028"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0000000000002" y="240.00000000000028"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-F1508FC5-65F1-4AE5-9EEB-9AD6EE531B10" id="BPMNEdge_sid-F1508FC5-65F1-4AE5-9EEB-9AD6EE531B10">
+        <omgdi:waypoint x="414.58333333333337" y="178.416666666667"></omgdi:waypoint>
+        <omgdi:waypoint x="460.00000000000006" y="178.21834061135405"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" id="BPMNEdge_sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54">
-        <omgdi:waypoint x="744.639705882353" y="178.3602941176474"></omgdi:waypoint>
-        <omgdi:waypoint x="780.0003729405029" y="178.1021870588289"></omgdi:waypoint>
+        <omgdi:waypoint x="894.6144578313255" y="178.38554216867522"></omgdi:waypoint>
+        <omgdi:waypoint x="945.0002509882664" y="178.08383083240608"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2116D691-BD6C-4ABA-9346-27611BD512E7" id="BPMNEdge_sid-2116D691-BD6C-4ABA-9346-27611BD512E7">
+        <omgdi:waypoint x="560.0" y="178.22624434389184"></omgdi:waypoint>
+        <omgdi:waypoint x="600.4090909090911" y="178.40909090909145"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" id="BPMNEdge_sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8">
-        <omgdi:waypoint x="661.0000000000001" y="178.25660377358523"></omgdi:waypoint>
-        <omgdi:waypoint x="705.4242424242425" y="178.42424242424275"></omgdi:waypoint>
+        <omgdi:waypoint x="811.0000000000001" y="178.25660377358543"></omgdi:waypoint>
+        <omgdi:waypoint x="855.4242424242425" y="178.42424242424295"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-74886C9A-F93E-45FD-B170-FDA4BB0535C1" id="BPMNEdge_sid-74886C9A-F93E-45FD-B170-FDA4BB0535C1">
+        <omgdi:waypoint x="620.5000000000002" y="197.50000000000057"></omgdi:waypoint>
+        <omgdi:waypoint x="620.5000000000002" y="240.00000000000028"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0000000000002" y="240.00000000000028"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D" id="BPMNEdge_sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D">
-        <omgdi:waypoint x="474.6350198976693" y="178.3649801023312"></omgdi:waypoint>
-        <omgdi:waypoint x="525.0000000000001" y="178.00959638724277"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-A26EFFF7-C36E-4B34-9AF1-7FF4645F64BC" id="BPMNEdge_sid-A26EFFF7-C36E-4B34-9AF1-7FF4645F64BC">
+        <omgdi:waypoint x="639.5778688524592" y="178.42213114754153"></omgdi:waypoint>
+        <omgdi:waypoint x="675.0000000000001" y="178.2775510204087"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FF876226-1C90-40F2-B4E3-62947A248E25" id="BPMNEdge_sid-FF876226-1C90-40F2-B4E3-62947A248E25">
-        <omgdi:waypoint x="726.229248484821" y="196.77075151517937"></omgdi:waypoint>
-        <omgdi:waypoint x="726.855397449469" y="212.45842503482794"></omgdi:waypoint>
+        <omgdi:waypoint x="876.229248484821" y="196.77075151517965"></omgdi:waypoint>
+        <omgdi:waypoint x="876.8553974494688" y="212.45842503482794"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754" id="BPMNEdge_sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754">
-        <omgdi:waypoint x="383.0" y="178.00767350264877"></omgdi:waypoint>
-        <omgdi:waypoint x="435.3632572131822" y="178.36325721318235"></omgdi:waypoint>
+        <omgdi:waypoint x="338.0" y="178.0096367047587"></omgdi:waypoint>
+        <omgdi:waypoint x="375.3279717873731" y="178.32797178737337"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52" id="BPMNEdge_sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52">
         <omgdi:waypoint x="50.0" y="178.00000000000006"></omgdi:waypoint>
         <omgdi:waypoint x="90.00000000000001" y="178.0000000000002"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-57E7FC69-76D9-45D2-B60F-D665A28A7936" id="BPMNEdge_sid-57E7FC69-76D9-45D2-B60F-D665A28A7936">
-        <omgdi:waypoint x="190.0" y="178.00000000000037"></omgdi:waypoint>
-        <omgdi:waypoint x="270.00000000000006" y="178.0000000000004"></omgdi:waypoint>
+        <omgdi:waypoint x="190.0" y="178.00000000000026"></omgdi:waypoint>
+        <omgdi:waypoint x="225.00000000000003" y="178.00000000000017"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 57 - 30
src/main/resources/processes/oil_qual_change.bpmn20.xml

@@ -14,22 +14,31 @@
     <exclusiveGateway id="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389"></exclusiveGateway>
     <sequenceFlow id="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" sourceRef="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159" targetRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389"></sequenceFlow>
     <endEvent id="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19" name="通过"></endEvent>
-    <intermediateThrowEvent id="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F" name="未通过"></intermediateThrowEvent>
     <userTask id="sid-6B720031-BE93-49D1-A680-141FB9092976" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-1DEA22CC-EB5B-4DC7-B019-8E57A0DA616E" sourceRef="sid-F5587778-2194-43BD-B5A9-23041685B24E" targetRef="sid-6B720031-BE93-49D1-A680-141FB9092976"></sequenceFlow>
     <sequenceFlow id="sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754" sourceRef="sid-6B720031-BE93-49D1-A680-141FB9092976" targetRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A"></sequenceFlow>
-    <sequenceFlow id="sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159">
+    <sequenceFlow id="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-F5587778-2194-43BD-B5A9-23041685B24E">
+    <intermediateThrowEvent id="sid-BF8190DB-5579-4D8A-B71A-DCAF1EDE235A" name="未通过"></intermediateThrowEvent>
+    <sequenceFlow id="sid-D50320A9-DE1D-470C-81DB-3D02B830EB89" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-BF8190DB-5579-4D8A-B71A-DCAF1EDE235A">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-FF876226-1C90-40F2-B4E3-62947A248E25" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-E838DEA5-5CF4-4A76-A690-1A85EDE4613F">
+    <userTask id="sid-0139C8F8-58E2-4C6E-BB7E-F528BED5AC50" name="二级单位复审" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-3051C9F4-297E-43F9-A8A1-4E553A77878D"></exclusiveGateway>
+    <sequenceFlow id="sid-7989C7C3-5B8C-4157-AF19-EA2D5C0E2893" sourceRef="sid-0139C8F8-58E2-4C6E-BB7E-F528BED5AC50" targetRef="sid-3051C9F4-297E-43F9-A8A1-4E553A77878D"></sequenceFlow>
+    <sequenceFlow id="sid-0AE0D2ED-E0A8-4207-ADBC-0A51C7C11A5D" name="通过" sourceRef="sid-3051C9F4-297E-43F9-A8A1-4E553A77878D" targetRef="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-F9FB8CC4-F85D-47D3-AC37-1879547B2165" name="不通过" sourceRef="sid-3051C9F4-297E-43F9-A8A1-4E553A77878D" targetRef="sid-BF8190DB-5579-4D8A-B71A-DCAF1EDE235A">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" sourceRef="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" targetRef="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19">
+    <sequenceFlow id="sid-B395F9D4-E535-4183-A875-280F1DAC15F5" name="通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-0139C8F8-58E2-4C6E-BB7E-F528BED5AC50">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" name="不通过" sourceRef="sid-9066F48C-509C-4652-B697-A7F0E400D57A" targetRef="sid-BF8190DB-5579-4D8A-B71A-DCAF1EDE235A">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_qual_change">
     <bpmndi:BPMNPlane bpmnElement="oil_qual_change" id="BPMNPlane_oil_qual_change">
@@ -40,57 +49,75 @@
         <omgdc:Bounds height="80.0" width="100.0" x="95.0" y="138.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-9066F48C-509C-4652-B697-A7F0E400D57A" id="BPMNShape_sid-9066F48C-509C-4652-B697-A7F0E400D57A">
-        <omgdc:Bounds height="40.0" width="40.0" x="390.00000000000006" y="158.00000000000034"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="375.00000000000006" y="158.00000000000003"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159" id="BPMNShape_sid-A33D8E7E-EC3E-4DB8-8AC5-C1FDBC5C1159">
-        <omgdc:Bounds height="83.0" width="135.99999999999994" x="480.00000000000006" y="136.50000000000037"></omgdc:Bounds>
+        <omgdc:Bounds height="83.0" width="135.9999999999999" x="675.0000000000001" y="136.50000000000057"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-2012FCB2-003F-4B4F-93F0-2B75C6615389" id="BPMNShape_sid-2012FCB2-003F-4B4F-93F0-2B75C6615389">
-        <omgdc:Bounds height="40.0" width="40.0" x="675.0000000000001" y="158.0000000000004"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="855.0000000000001" y="158.00000000000057"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-F5772351-1198-4091-B3A6-FC55ACBFEA19" id="BPMNShape_sid-F5772351-1198-4091-B3A6-FC55ACBFEA19">
-        <omgdc:Bounds height="28.0" width="28.0" x="750.0000000000001" y="164.00000000000003"></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="680.0000000000002" y="230.00000000000006"></omgdc:Bounds>
+        <omgdc:Bounds height="28.0" width="28.0" x="930.0000000000001" y="164.00000000000003"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-6B720031-BE93-49D1-A680-141FB9092976" id="BPMNShape_sid-6B720031-BE93-49D1-A680-141FB9092976">
-        <omgdc:Bounds height="80.0" width="108.99999999999997" x="240.00000000000003" y="138.00000000000003"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="108.99999999999997" x="225.00000000000003" y="138.00000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-BF8190DB-5579-4D8A-B71A-DCAF1EDE235A" id="BPMNShape_sid-BF8190DB-5579-4D8A-B71A-DCAF1EDE235A">
+        <omgdc:Bounds height="30.0" width="30.0" x="860.0000000000002" y="225.00000000000006"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-0139C8F8-58E2-4C6E-BB7E-F528BED5AC50" id="BPMNShape_sid-0139C8F8-58E2-4C6E-BB7E-F528BED5AC50">
+        <omgdc:Bounds height="80.0" width="99.99999999999994" x="450.00000000000006" y="135.00000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-3051C9F4-297E-43F9-A8A1-4E553A77878D" id="BPMNShape_sid-3051C9F4-297E-43F9-A8A1-4E553A77878D">
+        <omgdc:Bounds height="40.0" width="40.0" x="595.0" y="155.00000000000003"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-1DEA22CC-EB5B-4DC7-B019-8E57A0DA616E" id="BPMNEdge_sid-1DEA22CC-EB5B-4DC7-B019-8E57A0DA616E">
         <omgdi:waypoint x="195.0" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="240.00000000000003" y="178.00000000000003"></omgdi:waypoint>
+        <omgdi:waypoint x="225.00000000000003" y="178.00000000000003"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54" id="BPMNEdge_sid-099D5FD1-355B-4C72-B8E0-EB87D074CE54">
-        <omgdi:waypoint x="714.6397058823532" y="178.36029411764736"></omgdi:waypoint>
-        <omgdi:waypoint x="750.0003729405029" y="178.10218705882855"></omgdi:waypoint>
+        <omgdi:waypoint x="894.6397058823532" y="178.36029411764747"></omgdi:waypoint>
+        <omgdi:waypoint x="930.0003729405029" y="178.1021870588286"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8" id="BPMNEdge_sid-4C2A5ADA-8255-4945-B7BE-4364FC164FB8">
-        <omgdi:waypoint x="616.0" y="178.23050847457665"></omgdi:waypoint>
-        <omgdi:waypoint x="675.4319727891158" y="178.43197278911603"></omgdi:waypoint>
+        <omgdi:waypoint x="811.0" y="178.25660377358548"></omgdi:waypoint>
+        <omgdi:waypoint x="855.4242424242425" y="178.424242424243"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D" id="BPMNEdge_sid-914F4AEC-3A24-4B7B-8979-CA673FC8822D">
-        <omgdi:waypoint x="429.63501989766917" y="178.36498010233123"></omgdi:waypoint>
-        <omgdi:waypoint x="480.00000000000006" y="178.00959638724282"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-7989C7C3-5B8C-4157-AF19-EA2D5C0E2893" id="BPMNEdge_sid-7989C7C3-5B8C-4157-AF19-EA2D5C0E2893">
+        <omgdi:waypoint x="550.0" y="175.21645021645026"></omgdi:waypoint>
+        <omgdi:waypoint x="595.4130434782609" y="175.4130434782609"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB" id="BPMNEdge_sid-F65D3DE2-6472-45B0-A7FC-FBA6FFA921FB">
-        <omgdi:waypoint x="410.50000000000006" y="197.50000000000034"></omgdi:waypoint>
-        <omgdi:waypoint x="410.50000000000006" y="236.0"></omgdi:waypoint>
-        <omgdi:waypoint x="145.0" y="236.0"></omgdi:waypoint>
-        <omgdi:waypoint x="145.0" y="218.0"></omgdi:waypoint>
+        <omgdi:waypoint x="395.50000000000006" y="197.5"></omgdi:waypoint>
+        <omgdi:waypoint x="395.5000000000001" y="240.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0000000000002" y="240.00000000000006"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-FF876226-1C90-40F2-B4E3-62947A248E25" id="BPMNEdge_sid-FF876226-1C90-40F2-B4E3-62947A248E25">
-        <omgdi:waypoint x="695.3560606060607" y="197.64393939393977"></omgdi:waypoint>
-        <omgdi:waypoint x="695.1127787671105" y="230.00042397433555"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-0AE0D2ED-E0A8-4207-ADBC-0A51C7C11A5D" id="BPMNEdge_sid-0AE0D2ED-E0A8-4207-ADBC-0A51C7C11A5D">
+        <omgdi:waypoint x="634.1346153846154" y="175.86538461538473"></omgdi:waypoint>
+        <omgdi:waypoint x="675.0000000000001" y="176.66666666666694"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-F9FB8CC4-F85D-47D3-AC37-1879547B2165" id="BPMNEdge_sid-F9FB8CC4-F85D-47D3-AC37-1879547B2165">
+        <omgdi:waypoint x="615.5" y="194.50000000000003"></omgdi:waypoint>
+        <omgdi:waypoint x="615.5" y="240.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="860.0000000000002" y="240.00000000000006"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754" id="BPMNEdge_sid-EDD2C1DA-80DA-492F-897E-FA3D9D595754">
-        <omgdi:waypoint x="349.0" y="178.00870746125582"></omgdi:waypoint>
-        <omgdi:waypoint x="390.33894346915764" y="178.33894346915793"></omgdi:waypoint>
+        <omgdi:waypoint x="334.0" y="178.00870746125582"></omgdi:waypoint>
+        <omgdi:waypoint x="375.33894346915775" y="178.3389434691577"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-D50320A9-DE1D-470C-81DB-3D02B830EB89" id="BPMNEdge_sid-D50320A9-DE1D-470C-81DB-3D02B830EB89">
+        <omgdi:waypoint x="875.3442622950821" y="197.65573770491858"></omgdi:waypoint>
+        <omgdi:waypoint x="875.1219471893328" y="225.0004957120906"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52" id="BPMNEdge_sid-2E4346F3-7362-419A-A96F-2ED4DCE44A52">
         <omgdi:waypoint x="50.0" y="178.0"></omgdi:waypoint>
         <omgdi:waypoint x="95.0" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-B395F9D4-E535-4183-A875-280F1DAC15F5" id="BPMNEdge_sid-B395F9D4-E535-4183-A875-280F1DAC15F5">
+        <omgdi:waypoint x="414.8518518518519" y="177.85185185185188"></omgdi:waypoint>
+        <omgdi:waypoint x="450.00000000000006" y="176.6746411483254"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>

+ 40 - 40
src/main/resources/processes/oil_second_append_apply.bpmn20.xml

@@ -17,29 +17,30 @@
     <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
     <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-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-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <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-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
     <userTask id="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" name="业务处室接收" 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>
-    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+    <intermediateThrowEvent id="sid-38625307-6E6B-4E09-B972-7D9E602C7B8E"></intermediateThrowEvent>
+    <sequenceFlow id="sid-5FD01CF3-F33A-45F1-9871-757C7B8CB2B0" name="不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-38625307-6E6B-4E09-B972-7D9E602C7B8E">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" name="通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
     <sequenceFlow id="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" name="通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7">
+    <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-38625307-6E6B-4E09-B972-7D9E602C7B8E">
+      <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-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-38625307-6E6B-4E09-B972-7D9E602C7B8E">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_second_append_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_second_append_apply" id="BPMNPlane_oil_second_append_apply">
@@ -47,13 +48,13 @@
         <omgdc:Bounds height="30.0" width="30.0" x="39.66663571640221" y="284.99999735090466"></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="105.0" y="259.9999973509048"></omgdc:Bounds>
+        <omgdc:Bounds height="79.99999999999994" width="99.99999999999999" x="105.00000000000001" y="259.9999973509053"></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="825.0000000000003" y="259.9999973509052"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" id="BPMNShape_sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
-        <omgdc:Bounds height="40.0" width="40.0" x="960.0000000000002" y="279.9999973509047"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="960.0000000000002" y="279.99999735090523"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" id="BPMNShape_sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
         <omgdc:Bounds height="80.0" width="99.99999999999994" x="480.00000000000006" y="259.9999973509047"></omgdc:Bounds>
@@ -62,7 +63,7 @@
         <omgdc:Bounds height="40.0" width="40.0" x="615.0000000000002" y="279.99999735090506"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" id="BPMNShape_sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
-        <omgdc:Bounds height="80.0" width="99.99999999999997" x="255.00000000000003" y="259.9999973509047"></omgdc:Bounds>
+        <omgdc:Bounds height="79.99999999999994" width="99.99999999999997" x="255.00000000000003" y="259.9999973509053"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" id="BPMNShape_sid-C9D007EC-DA5F-480E-A280-EBF70615C514">
         <omgdc:Bounds height="40.0" width="40.0" x="405.00000000000006" y="279.9999973509047"></omgdc:Bounds>
@@ -73,59 +74,58 @@
       <bpmndi:BPMNShape bpmnElement="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7" id="BPMNShape_sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7">
         <omgdc:Bounds height="28.0" width="28.0" x="1045.0000000000002" y="285.9999973509052"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-38625307-6E6B-4E09-B972-7D9E602C7B8E" id="BPMNShape_sid-38625307-6E6B-4E09-B972-7D9E602C7B8E">
+        <omgdc:Bounds height="30.0" width="30.0" x="965.0000000000003" y="360.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="925.0000000000003" y="299.9999973509049"></omgdi:waypoint>
-        <omgdi:waypoint x="960.0000000000001" y="299.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="925.0000000000003" y="299.9999973509052"></omgdi:waypoint>
+        <omgdi:waypoint x="960.0000000000002" y="299.99999735090523"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" id="BPMNEdge_sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9">
+        <omgdi:waypoint x="999.6217948717951" y="300.37820247911037"></omgdi:waypoint>
+        <omgdi:waypoint x="1045.0002839785395" y="300.089167516647"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
         <omgdi:waypoint x="444.5913461538462" y="300.4086511970586"></omgdi:waypoint>
         <omgdi:waypoint x="480.00000000000006" y="300.2392318006655"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" id="BPMNEdge_sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9">
-        <omgdi:waypoint x="999.621794871795" y="300.37820247911"></omgdi:waypoint>
-        <omgdi:waypoint x="1045.0002839785395" y="300.0891675166469"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" id="BPMNEdge_sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C">
-        <omgdi:waypoint x="980.0000000000002" y="319.9999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="980.0000000000002" y="412.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="412.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="339.9999973509048"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-842910A7-33C0-4DC1-B663-84C688761DA7" id="BPMNEdge_sid-842910A7-33C0-4DC1-B663-84C688761DA7">
-        <omgdi:waypoint x="69.66663571640221" y="299.99999735090466"></omgdi:waypoint>
-        <omgdi:waypoint x="105.0" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="69.66663571640221" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="105.00000000000001" y="299.99999735090495"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" id="BPMNEdge_sid-22C499F4-7179-4558-BC4C-77EF7453FA56">
         <omgdi:waypoint x="790.0000000000001" y="299.9999973509051"></omgdi:waypoint>
         <omgdi:waypoint x="825.0000000000003" y="299.9999973509051"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
-        <omgdi:waypoint x="355.0" y="299.9999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="405.00000000000006" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="355.0" y="299.999997350905"></omgdi:waypoint>
+        <omgdi:waypoint x="404.99999999999994" y="299.99999735090483"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C0B325B4-3F9E-4498-9045-0277541DA2FC" id="BPMNEdge_sid-C0B325B4-3F9E-4498-9045-0277541DA2FC">
-        <omgdi:waypoint x="205.0" y="299.9999973509048"></omgdi:waypoint>
-        <omgdi:waypoint x="255.00000000000003" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="205.0" y="299.99999735090523"></omgdi:waypoint>
+        <omgdi:waypoint x="255.00000000000003" y="299.99999735090523"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
-        <omgdi:waypoint x="425.50000000000006" y="280.4999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="425.50000000000006" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="259.9999973509048"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-5FD01CF3-F33A-45F1-9871-757C7B8CB2B0" id="BPMNEdge_sid-5FD01CF3-F33A-45F1-9871-757C7B8CB2B0">
+        <omgdi:waypoint x="980.3716216262177" y="319.6283757246878"></omgdi:waypoint>
+        <omgdi:waypoint x="980.1006688701711" y="360.0003378111847"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
         <omgdi:waypoint x="654.5913461538464" y="300.40865119705893"></omgdi:waypoint>
         <omgdi:waypoint x="690.0000000000001" y="300.23923180066583"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
+        <omgdi:waypoint x="425.50000000000006" y="319.4999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="425.5000000000001" y="375.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0000000000003" y="375.0000000000001"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
         <omgdi:waypoint x="580.0" y="299.999997350905"></omgdi:waypoint>
         <omgdi:waypoint x="615.0000000000001" y="299.9999973509052"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
         <omgdi:waypoint x="635.0000000000002" y="319.99999735090506"></omgdi:waypoint>
-        <omgdi:waypoint x="635.0000000000002" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="339.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="635.0000000000002" y="375.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0000000000003" y="375.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 141 - 0
src/main/resources/processes/oil_second_enuser_supplier_apply.bpmn20.xml

@@ -0,0 +1,141 @@
+<?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>
+    <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>
+    <exclusiveGateway id="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></exclusiveGateway>
+    <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="二级单位复审" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
+    <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
+    <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-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></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-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>
+    <sequenceFlow id="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" name="通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <userTask id="sid-8988B359-05F0-4FF6-8910-B395ED0BFA1F" 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-AFC091C4-363E-4BB7-9954-9391FA78E542" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-8988B359-05F0-4FF6-8910-B395ED0BFA1F"></sequenceFlow>
+    <sequenceFlow id="sid-73EFDDF4-5B80-4056-B6FC-15B868734F3F" sourceRef="sid-8988B359-05F0-4FF6-8910-B395ED0BFA1F" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
+    <intermediateThrowEvent id="sid-D718B3DA-E003-4A00-B3FA-4D32985377BB"></intermediateThrowEvent>
+    <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>
+  </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">
+      <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="15.000000000000002" y="280.00000000000006"></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.99999999999997" width="99.99999999999997" x="210.00000000000003" y="255.00000000000003"></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="885.0000000000003" y="255.00000000000009"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" id="BPMNShape_sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
+        <omgdc:Bounds height="40.0" width="39.999999999999886" x="1020.0000000000003" y="275.00000000000006"></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.99999999999997" width="99.99999999999989" x="555.0000000000001" y="255.00000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-E178BD57-68C0-4C23-8952-143905257209" id="BPMNShape_sid-E178BD57-68C0-4C23-8952-143905257209">
+        <omgdc:Bounds height="40.0" width="40.0" x="675.0000000000002" y="275.00000000000006"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" id="BPMNShape_sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF">
+        <omgdc:Bounds height="79.99999999999997" width="99.99999999999994" x="345.00000000000006" y="255.00000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" id="BPMNShape_sid-C9D007EC-DA5F-480E-A280-EBF70615C514">
+        <omgdc:Bounds height="40.0" width="39.99999999999994" x="480.00000000000006" y="275.0000000000001"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" id="BPMNShape_sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
+        <omgdc:Bounds height="79.99999999999997" width="100.0" x="750.0000000000003" y="255.00000000000003"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7" id="BPMNShape_sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7">
+        <omgdc:Bounds height="28.0" width="28.0" x="1095.0000000000005" y="281.00000000000006"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-8988B359-05F0-4FF6-8910-B395ED0BFA1F" id="BPMNShape_sid-8988B359-05F0-4FF6-8910-B395ED0BFA1F">
+        <omgdc:Bounds height="79.99999999999997" width="99.99999999999999" x="75.00000000000001" y="255.00000000000003"></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="1025.0000000000002" y="360.00000000000017"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
+        <omgdi:waypoint x="985.0000000000003" y="295.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="1020.0000000000003" y="295.00000000000006"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" id="BPMNEdge_sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9">
+        <omgdi:waypoint x="1059.6397058823532" y="295.36029411764713"></omgdi:waypoint>
+        <omgdi:waypoint x="1095.0003729405032" 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="1040.3797468354433" y="314.620253164557"></omgdi:waypoint>
+        <omgdi:waypoint x="1040.0943377568765" y="360.00029665667944"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2BD5B023-739C-4D78-8F49-F1B96336102D" id="BPMNEdge_sid-2BD5B023-739C-4D78-8F49-F1B96336102D">
+        <omgdi:waypoint x="445.0" y="295.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="480.00000000000006" 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="310.0" y="295.0"></omgdi:waypoint>
+        <omgdi:waypoint x="345.00000000000006" y="295.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="519.5913461538462" y="295.4086538461539"></omgdi:waypoint>
+        <omgdi:waypoint x="555.0000000000001" 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="850.0000000000003" y="295.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="885.0000000000003" y="295.00000000000006"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-AFC091C4-363E-4BB7-9954-9391FA78E542" id="BPMNEdge_sid-AFC091C4-363E-4BB7-9954-9391FA78E542">
+        <omgdi:waypoint x="45.0" y="295.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="75.00000000000001" 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="175.0" y="295.0"></omgdi:waypoint>
+        <omgdi:waypoint x="210.00000000000003" 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="714.5913461538464" y="295.40865384615387"></omgdi:waypoint>
+        <omgdi:waypoint x="750.0000000000003" 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="500.5" y="314.5000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="500.5" y="375.00000000000017"></omgdi:waypoint>
+        <omgdi:waypoint x="1025.0000000000002" y="375.00000000000017"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
+        <omgdi:waypoint x="655.0" y="295.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="675.0000000000001" y="295.00000000000017"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
+        <omgdi:waypoint x="695.0000000000002" y="315.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="695.0000000000002" y="375.00000000000017"></omgdi:waypoint>
+        <omgdi:waypoint x="1025.0000000000002" y="375.00000000000017"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

+ 29 - 29
src/main/resources/processes/oil_second_supplier_apply.bpmn20.xml

@@ -17,29 +17,30 @@
     <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
     <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-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-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <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-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+    <sequenceFlow id="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" name="不通过" sourceRef="sid-C9D007EC-DA5F-480E-A280-EBF70615C514" targetRef="sid-152D3B19-66E4-4120-B8B9-888D07C0C259">
       <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-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>
-    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" name="通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <intermediateThrowEvent id="sid-152D3B19-66E4-4120-B8B9-888D07C0C259"></intermediateThrowEvent>
+    <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-152D3B19-66E4-4120-B8B9-888D07C0C259">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-E9A23BA7-AB35-403D-8D74-F8E02B2B9C2A" name="不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-152D3B19-66E4-4120-B8B9-888D07C0C259">
+      <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>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_second_supplier_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_second_supplier_apply" id="BPMNPlane_oil_second_supplier_apply">
@@ -53,7 +54,7 @@
         <omgdc:Bounds height="79.99999999999994" width="100.0" x="825.0000000000003" y="259.9999973509052"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" id="BPMNShape_sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
-        <omgdc:Bounds height="40.0" width="40.0" x="960.0000000000002" y="279.9999973509047"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="960.0000000000002" y="279.99999735090523"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" id="BPMNShape_sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
         <omgdc:Bounds height="80.0" width="99.99999999999994" x="480.00000000000006" y="259.9999973509047"></omgdc:Bounds>
@@ -73,23 +74,24 @@
       <bpmndi:BPMNShape bpmnElement="sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7" id="BPMNShape_sid-585CDFA5-897A-4C98-AAE6-2242AEEF64E7">
         <omgdc:Bounds height="28.0" width="28.0" x="1045.0000000000002" y="285.9999973509052"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-152D3B19-66E4-4120-B8B9-888D07C0C259" id="BPMNShape_sid-152D3B19-66E4-4120-B8B9-888D07C0C259">
+        <omgdc:Bounds height="30.0" width="30.0" x="965.0000000000003" y="360.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="925.0000000000003" y="299.9999973509049"></omgdi:waypoint>
-        <omgdi:waypoint x="960.0000000000001" y="299.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="925.0000000000003" y="299.9999973509052"></omgdi:waypoint>
+        <omgdi:waypoint x="960.0000000000002" y="299.99999735090523"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" id="BPMNEdge_sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9">
+        <omgdi:waypoint x="999.6217948717951" y="300.37820247911037"></omgdi:waypoint>
+        <omgdi:waypoint x="1045.0002839785395" y="300.089167516647"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C916BA74-384F-4684-8ADB-16EA158FDE07" id="BPMNEdge_sid-C916BA74-384F-4684-8ADB-16EA158FDE07">
         <omgdi:waypoint x="444.5913461538462" y="300.4086511970586"></omgdi:waypoint>
         <omgdi:waypoint x="480.00000000000006" y="300.2392318006655"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9" id="BPMNEdge_sid-5EAB3EB7-D688-4F39-85CB-8B9FBF917DA9">
-        <omgdi:waypoint x="999.621794871795" y="300.37820247911"></omgdi:waypoint>
-        <omgdi:waypoint x="1045.0002839785395" y="300.0891675166469"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" id="BPMNEdge_sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C">
-        <omgdi:waypoint x="980.0000000000002" y="319.9999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="980.0000000000002" y="412.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="412.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="339.9999973509048"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-E9A23BA7-AB35-403D-8D74-F8E02B2B9C2A" id="BPMNEdge_sid-E9A23BA7-AB35-403D-8D74-F8E02B2B9C2A">
+        <omgdi:waypoint x="980.3716216262177" y="319.6283757246878"></omgdi:waypoint>
+        <omgdi:waypoint x="980.1006688701711" y="360.0003378111847"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-842910A7-33C0-4DC1-B663-84C688761DA7" id="BPMNEdge_sid-842910A7-33C0-4DC1-B663-84C688761DA7">
         <omgdi:waypoint x="69.66663571640221" y="299.99999735090466"></omgdi:waypoint>
@@ -108,10 +110,9 @@
         <omgdi:waypoint x="255.00000000000003" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
-        <omgdi:waypoint x="425.50000000000006" y="280.4999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="425.50000000000006" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="259.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="425.50000000000006" y="319.4999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="425.5000000000001" y="375.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0000000000003" y="375.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="654.5913461538464" y="300.40865119705893"></omgdi:waypoint>
@@ -123,9 +124,8 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
         <omgdi:waypoint x="635.0000000000002" y="319.99999735090506"></omgdi:waypoint>
-        <omgdi:waypoint x="635.0000000000002" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="339.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="635.0000000000002" y="375.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0000000000003" y="375.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 19 - 22
src/main/resources/processes/oil_supplier_apply_1.bpmn20.xml

@@ -32,15 +32,9 @@
       <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-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-E19E2941-6B2A-4114-B292-5D789BA0959A" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3"></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-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+    <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>
@@ -48,6 +42,12 @@
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></sequenceFlow>
+    <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-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-3DF26A43-3984-4930-AA15-6CBD627202FE">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_supplier_apply_1">
     <bpmndi:BPMNPlane bpmnElement="oil_supplier_apply_1" id="BPMNPlane_oil_supplier_apply_1">
@@ -85,7 +85,7 @@
         <omgdc:Bounds height="28.0" width="28.0" x="1230.0000000000002" y="285.9999973509047"></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="1160.0000000000005" y="375.00000000000006"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="1160.0000000000005" y="375.0000000000001"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" id="BPMNShape_sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
         <omgdc:Bounds height="80.0" width="100.0" x="690.0000000000001" y="259.9999973509051"></omgdc:Bounds>
@@ -96,13 +96,12 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" id="BPMNEdge_sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170">
         <omgdi:waypoint x="1175.3932584301438" y="319.6067389207612"></omgdi:waypoint>
-        <omgdi:waypoint x="1175.0837975725503" y="375.0002340695985"></omgdi:waypoint>
+        <omgdi:waypoint x="1175.0837975725503" y="375.00023406959855"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" id="BPMNEdge_sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C">
         <omgdi:waypoint x="980.0000000000001" y="319.9999973509048"></omgdi:waypoint>
-        <omgdi:waypoint x="980.0000000000001" y="412.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="412.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="339.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="980.0" y="390.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1160.0000000000005" y="390.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-842910A7-33C0-4DC1-B663-84C688761DA7" id="BPMNEdge_sid-842910A7-33C0-4DC1-B663-84C688761DA7">
         <omgdi:waypoint x="69.66663571640221" y="299.99999735090466"></omgdi:waypoint>
@@ -129,10 +128,9 @@
         <omgdi:waypoint x="825.0000000000003" y="299.9999973509051"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31" id="BPMNEdge_sid-E8B3C95F-9348-427A-AABB-7EC671CCDE31">
-        <omgdi:waypoint x="425.50000000000006" y="280.4999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="425.50000000000006" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="213.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="259.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="425.50000000000006" y="319.4999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="425.50000000000006" y="390.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1160.0000000000005" 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="654.5913461538464" y="300.40865119705893"></omgdi:waypoint>
@@ -146,16 +144,15 @@
         <omgdi:waypoint x="580.0" y="299.999997350905"></omgdi:waypoint>
         <omgdi:waypoint x="615.0000000000001" y="299.9999973509052"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
-        <omgdi:waypoint x="635.0000000000002" y="319.99999735090506"></omgdi:waypoint>
-        <omgdi:waypoint x="635.0000000000002" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="380.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="339.9999973509048"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E19E2941-6B2A-4114-B292-5D789BA0959A" id="BPMNEdge_sid-E19E2941-6B2A-4114-B292-5D789BA0959A">
         <omgdi:waypoint x="999.5913461538462" y="300.40865119705865"></omgdi:waypoint>
         <omgdi:waypoint x="1035.0000000000002" y="300.2392318006656"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
+        <omgdi:waypoint x="635.0000000000002" y="319.99999735090506"></omgdi:waypoint>
+        <omgdi:waypoint x="635.0000000000002" y="390.0000000000001"></omgdi:waypoint>
+        <omgdi:waypoint x="1160.0000000000005" y="390.0000000000001"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>