修改工作流

src/main/resources/config/application-dev.yml

@@ -37,12 +37,12 @@ spring:
     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-supplier?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
-        url: jdbc:mysql://39.98.34.197:3306/activiti_dqm?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
-        username: dqmnt_user
-        password: Y6Ba64w1Hezo
-        # username: root
-        # password: zks123456
+        url: jdbc:mysql://47.92.212.59:3306/activiti-supplier?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
+        # url: jdbc:mysql://39.98.34.197:3306/activiti_dqm?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
+        # username: dqmnt_user
+        # password: Y6Ba64w1Hezo
+        username: root
+        password: zks123456
         hikari:
             auto-commit: false
             data-source-properties:

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

@@ -8,35 +8,18 @@
         <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <exclusiveGateway id="sid-83F82DD8-F857-4908-9A4C-6C62A42F5207"></exclusiveGateway>
     <endEvent id="sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B" name="通过"></endEvent>
     <intermediateThrowEvent id="sid-32EE47FB-8A0C-4052-B073-347747A2413C" name="不通过"></intermediateThrowEvent>
     <userTask id="sid-D5765623-E20C-4774-9303-488697382FC8" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-BCE3633B-A666-47A5-A005-216CF9EBBA95" sourceRef="sid-F5587778-2194-43BD-B5A9-23041685B24E" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8"></sequenceFlow>
     <exclusiveGateway id="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></exclusiveGateway>
     <sequenceFlow id="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" sourceRef="sid-D5765623-E20C-4774-9303-488697382FC8" targetRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></sequenceFlow>
-    <userTask id="sid-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-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-0F7FB010-0A59-4862-8046-36C4B320FB28" name="未通过" sourceRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-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>
@@ -56,6 +39,12 @@
     <sequenceFlow id="sid-B002321E-58A5-4512-B00E-CB14E02E6DAD" name="企业用户申请" sourceRef="sid-9F109B73-35DC-42B6-9B6F-50816C67223E" targetRef="sid-0B124434-FDAD-4E82-91CB-E570A44E7FF3">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" sourceRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635" targetRef="sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <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>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_audit_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_audit_apply" id="BPMNPlane_oil_audit_apply">
@@ -65,14 +54,11 @@
       <bpmndi:BPMNShape bpmnElement="sid-F5587778-2194-43BD-B5A9-23041685B24E" id="BPMNShape_sid-F5587778-2194-43BD-B5A9-23041685B24E">
         <omgdc:Bounds height="80.0" width="100.0" x="210.0" y="75.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="1050.0" y="158.0000000000004"></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="1125.0" y="164.0000000000004"></omgdc:Bounds>
+        <omgdc:Bounds height="28.0" width="28.0" x="825.0" y="164.0"></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="1055.0" y="240.0"></omgdc:Bounds>
+        <omgdc:Bounds height="30.0" width="30.0" x="755.0" y="240.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D5765623-E20C-4774-9303-488697382FC8" id="BPMNShape_sid-D5765623-E20C-4774-9303-488697382FC8">
         <omgdc:Bounds height="80.0" width="100.0" x="390.0" y="138.0"></omgdc:Bounds>
@@ -80,17 +66,11 @@
       <bpmndi:BPMNShape bpmnElement="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" id="BPMNShape_sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE">
         <omgdc:Bounds height="40.0" width="40.0" x="510.0" y="158.00000000000003"></omgdc:Bounds>
       </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="900.0" y="138.0000000000004"></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.99999999999989" x="780.0" y="138.0000000000004"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" id="BPMNShape_sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9">
         <omgdc:Bounds height="80.0" width="100.0" x="585.0" y="138.00000000000003"></omgdc:Bounds>
       </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="705.0" y="158.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="750.0" y="158.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-9F109B73-35DC-42B6-9B6F-50816C67223E" id="BPMNShape_sid-9F109B73-35DC-42B6-9B6F-50816C67223E">
         <omgdc:Bounds height="40.0" width="40.0" x="95.0" y="158.0"></omgdc:Bounds>
@@ -101,37 +81,6 @@
       <bpmndi:BPMNShape bpmnElement="sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8" id="BPMNShape_sid-D55B6E5D-5608-449F-A7A9-A349E1EA4BA8">
         <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="215.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-B002321E-58A5-4512-B00E-CB14E02E6DAD" id="BPMNEdge_sid-B002321E-58A5-4512-B00E-CB14E02E6DAD">
-        <omgdi:waypoint x="115.5" y="197.5"></omgdi:waypoint>
-        <omgdi:waypoint x="115.5" y="255.0"></omgdi:waypoint>
-        <omgdi:waypoint x="150.0" y="255.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" id="BPMNEdge_sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D">
-        <omgdi:waypoint x="1089.639705882353" y="178.36029411764747"></omgdi:waypoint>
-        <omgdi:waypoint x="1125.0003729405028" y="178.10218705882886"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-BB78E104-5EE5-462C-8332-9774206D19BA" id="BPMNEdge_sid-BB78E104-5EE5-462C-8332-9774206D19BA">
-        <omgdi:waypoint x="59.99962276962535" y="178.106380303331"></omgdi:waypoint>
-        <omgdi:waypoint x="95.35714285714297" y="178.35714285714297"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-BCE3633B-A666-47A5-A005-216CF9EBBA95" id="BPMNEdge_sid-BCE3633B-A666-47A5-A005-216CF9EBBA95">
-        <omgdi:waypoint x="310.0" y="115.0"></omgdi:waypoint>
-        <omgdi:waypoint x="440.0" y="115.0"></omgdi:waypoint>
-        <omgdi:waypoint x="440.0" y="138.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-B68E8B23-15DA-47EB-837B-9830D40B9696" id="BPMNEdge_sid-B68E8B23-15DA-47EB-837B-9830D40B9696">
-        <omgdi:waypoint x="1070.5" y="197.5000000000004"></omgdi:waypoint>
-        <omgdi:waypoint x="1070.5" y="231.50000000000009"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-284BE3C1-637A-496C-B7B3-CEFB815A8BF2" id="BPMNEdge_sid-284BE3C1-637A-496C-B7B3-CEFB815A8BF2">
-        <omgdi:waypoint x="115.5" y="158.5"></omgdi:waypoint>
-        <omgdi:waypoint x="115.5" y="115.0"></omgdi:waypoint>
-        <omgdi:waypoint x="210.0" y="115.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-6859CEC6-ACF1-44CD-9F6D-E2A069698817" id="BPMNEdge_sid-6859CEC6-ACF1-44CD-9F6D-E2A069698817">
-        <omgdi:waypoint x="1020.9999999999999" y="178.0119305856837"></omgdi:waypoint>
-        <omgdi:waypoint x="1050.3008364867555" y="178.30083648675603"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-179CD02C-C471-44D4-A64E-82BCEC645FA6" id="BPMNEdge_sid-179CD02C-C471-44D4-A64E-82BCEC645FA6">
         <omgdi:waypoint x="250.0" y="255.0"></omgdi:waypoint>
         <omgdi:waypoint x="270.0" y="255.0"></omgdi:waypoint>
@@ -139,20 +88,28 @@
       <bpmndi:BPMNEdge bpmnElement="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" id="BPMNEdge_sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163">
         <omgdi:waypoint x="530.5555419921875" y="197.44445800781253"></omgdi:waypoint>
         <omgdi:waypoint x="530.5555419921875" y="255.00000000000003"></omgdi:waypoint>
-        <omgdi:waypoint x="1055.0" y="255.00000000000003"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="255.00000000000003"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" id="BPMNEdge_sid-0F7FB010-0A59-4862-8046-36C4B320FB28">
-        <omgdi:waypoint x="725.5" y="197.5"></omgdi:waypoint>
-        <omgdi:waypoint x="725.5" y="255.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1055.0" y="255.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-B002321E-58A5-4512-B00E-CB14E02E6DAD" id="BPMNEdge_sid-B002321E-58A5-4512-B00E-CB14E02E6DAD">
+        <omgdi:waypoint x="115.5" y="197.5"></omgdi:waypoint>
+        <omgdi:waypoint x="115.5" y="255.0"></omgdi:waypoint>
+        <omgdi:waypoint x="150.0" y="255.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-388CA9A5-465E-4390-A925-7A535A689BF1" id="BPMNEdge_sid-388CA9A5-465E-4390-A925-7A535A689BF1">
-        <omgdi:waypoint x="744.5913461538461" y="178.40865384615392"></omgdi:waypoint>
-        <omgdi:waypoint x="780.0" y="178.23923444976097"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" id="BPMNEdge_sid-0F7FB010-0A59-4862-8046-36C4B320FB28">
+        <omgdi:waypoint x="770.375" y="197.625"></omgdi:waypoint>
+        <omgdi:waypoint x="770.0980371217038" y="240.00032037932917"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" id="BPMNEdge_sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A">
-        <omgdi:waypoint x="685.0" y="178.2762430939227"></omgdi:waypoint>
-        <omgdi:waypoint x="705.3888888888889" y="178.38888888888889"></omgdi:waypoint>
+        <omgdi:waypoint x="685.0" y="178.18450184501847"></omgdi:waypoint>
+        <omgdi:waypoint x="750.425925925926" y="178.42592592592592"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-BB78E104-5EE5-462C-8332-9774206D19BA" id="BPMNEdge_sid-BB78E104-5EE5-462C-8332-9774206D19BA">
+        <omgdi:waypoint x="59.99962276962535" y="178.106380303331"></omgdi:waypoint>
+        <omgdi:waypoint x="95.35714285714297" y="178.35714285714297"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" id="BPMNEdge_sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D">
+        <omgdi:waypoint x="789.6397058823529" y="178.36029411764707"></omgdi:waypoint>
+        <omgdi:waypoint x="825.0003729405028" y="178.10218705882846"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01" id="BPMNEdge_sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01">
         <omgdi:waypoint x="370.0" y="255.0"></omgdi:waypoint>
@@ -163,14 +120,20 @@
         <omgdi:waypoint x="490.0" y="178.27624309392266"></omgdi:waypoint>
         <omgdi:waypoint x="510.38888888888886" y="178.3888888888889"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-D41C626E-114D-42A3-A121-9FE3A9F16096" id="BPMNEdge_sid-D41C626E-114D-42A3-A121-9FE3A9F16096">
-        <omgdi:waypoint x="879.9999999999999" y="178.0000000000004"></omgdi:waypoint>
-        <omgdi:waypoint x="900.0" y="178.0000000000004"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-BCE3633B-A666-47A5-A005-216CF9EBBA95" id="BPMNEdge_sid-BCE3633B-A666-47A5-A005-216CF9EBBA95">
+        <omgdi:waypoint x="310.0" y="115.0"></omgdi:waypoint>
+        <omgdi:waypoint x="440.0" y="115.0"></omgdi:waypoint>
+        <omgdi:waypoint x="440.0" y="138.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-002682E5-FF90-4A74-8707-0F8B98C09674" id="BPMNEdge_sid-002682E5-FF90-4A74-8707-0F8B98C09674">
         <omgdi:waypoint x="549.5913461538462" y="178.40865384615387"></omgdi:waypoint>
         <omgdi:waypoint x="585.0" y="178.2392344497608"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-284BE3C1-637A-496C-B7B3-CEFB815A8BF2" id="BPMNEdge_sid-284BE3C1-637A-496C-B7B3-CEFB815A8BF2">
+        <omgdi:waypoint x="115.5" y="158.5"></omgdi:waypoint>
+        <omgdi:waypoint x="115.5" y="115.0"></omgdi:waypoint>
+        <omgdi:waypoint x="210.0" y="115.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>