工作流

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/activiti2?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?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
             minimum-idle: 5

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
   <process id="oil_audit_apply" name="oil_audit_apply" isExecutable="true">
-    <documentation>供方年审流程图(分办可退回)</documentation>
+    <documentation>供方年审流程图</documentation>
     <startEvent id="startEvent1" name="开始"></startEvent>
     <userTask id="sid-F5587778-2194-43BD-B5A9-23041685B24E" name="供方申请" activiti:assignee="${recorder}">
       <extensionElements>
@@ -15,7 +15,6 @@
     <exclusiveGateway id="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></exclusiveGateway>
     <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>
     <exclusiveGateway id="sid-9F109B73-35DC-42B6-9B6F-50816C67223E"></exclusiveGateway>
     <sequenceFlow id="sid-BB78E104-5EE5-462C-8332-9774206D19BA" sourceRef="startEvent1" targetRef="sid-9F109B73-35DC-42B6-9B6F-50816C67223E"></sequenceFlow>
     <userTask id="sid-0B124434-FDAD-4E82-91CB-E570A44E7FF3" name="企业用户申请" activiti:assignee="${recorder}">
@@ -32,26 +31,36 @@
     <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>
-    <sequenceFlow id="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" sourceRef="sid-D5765623-E20C-4774-9303-488697382FC8" targetRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></sequenceFlow>
     <exclusiveGateway id="sid-01162014-E410-4093-B0BF-4DC735CE9D7B"></exclusiveGateway>
+    <sequenceFlow id="sid-048E2CD6-94A7-4BF7-A5A4-0DD8AF6C9C63" name="通过" sourceRef="sid-01162014-E410-4093-B0BF-4DC735CE9D7B" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-12EF6884-8C49-425E-92E3-F158345B016D" name="未通过" sourceRef="sid-01162014-E410-4093-B0BF-4DC735CE9D7B" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <exclusiveGateway id="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D"></exclusiveGateway>
     <sequenceFlow id="sid-002682E5-FF90-4A74-8707-0F8B98C09674" name="通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-048E2CD6-94A7-4BF7-A5A4-0DD8AF6C9C63" name="通过" sourceRef="sid-01162014-E410-4093-B0BF-4DC735CE9D7B" targetRef="sid-D5765623-E20C-4774-9303-488697382FC8">
+    <sequenceFlow id="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" sourceRef="sid-DEDBD6B6-5348-494A-A212-18A171193232" targetRef="sid-B93E1164-9FAC-4D21-A691-2A4411C35635"></sequenceFlow>
+    <sequenceFlow id="sid-1B585BE1-64A9-4B76-B863-B89E7E64D5F9" name="通过" sourceRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D" targetRef="sid-DEDBD6B6-5348-494A-A212-18A171193232">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" sourceRef="sid-D5765623-E20C-4774-9303-488697382FC8" targetRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE"></sequenceFlow>
+    <sequenceFlow id="sid-37BD7150-CF5D-4AA6-982D-B305AE720F99" sourceRef="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" targetRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D"></sequenceFlow>
     <sequenceFlow id="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" name="未通过" sourceRef="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-12EF6884-8C49-425E-92E3-F158345B016D" name="未通过" sourceRef="sid-01162014-E410-4093-B0BF-4DC735CE9D7B" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
+    <sequenceFlow id="sid-F39CE67A-02DA-44CB-A534-968088FC5F18" name="未通过" sourceRef="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D" targetRef="sid-32EE47FB-8A0C-4052-B073-347747A2413C">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
+    <userTask id="sid-DEDBD6B6-5348-494A-A212-18A171193232" name="企业法规处审批" activiti:candidateUsers="${users}"></userTask>
+    <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>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_audit_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_audit_apply" id="BPMNPlane_oil_audit_apply">
@@ -62,22 +71,22 @@
         <omgdc:Bounds height="80.0" width="100.0" x="210.0" y="75.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B" id="BPMNShape_sid-0AC9CE7C-C8FA-46E8-8DD6-3D75C898468B">
-        <omgdc:Bounds height="28.0" width="28.0" x="915.0" y="160.99999999999997"></omgdc:Bounds>
+        <omgdc:Bounds height="28.0" width="28.0" x="1035.0" y="160.99999999999997"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-32EE47FB-8A0C-4052-B073-347747A2413C" id="BPMNShape_sid-32EE47FB-8A0C-4052-B073-347747A2413C">
-        <omgdc:Bounds height="30.00000000000003" width="30.0" x="845.0" y="236.99999999999997"></omgdc:Bounds>
+        <omgdc:Bounds height="30.00000000000003" width="30.0" x="965.0" y="236.99999999999997"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-D5765623-E20C-4774-9303-488697382FC8" id="BPMNShape_sid-D5765623-E20C-4774-9303-488697382FC8">
         <omgdc:Bounds height="80.0" width="100.0" x="405.0" y="135.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE" id="BPMNShape_sid-F9F4339F-8661-4A1A-8DE1-910A47304BCE">
-        <omgdc:Bounds height="40.0" width="40.0" x="600.0" y="155.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="540.0" y="155.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9" id="BPMNShape_sid-8AD63D80-EE96-4C4A-8CB2-D68CD97446B9">
-        <omgdc:Bounds height="80.0" width="100.0" x="675.0" y="135.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="615.0" y="134.99999999999997"></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="840.0" y="154.99999999999997"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="960.0" y="154.99999999999997"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-9F109B73-35DC-42B6-9B6F-50816C67223E" id="BPMNShape_sid-9F109B73-35DC-42B6-9B6F-50816C67223E">
         <omgdc:Bounds height="40.0" width="40.0" x="95.0" y="158.0"></omgdc:Bounds>
@@ -91,6 +100,17 @@
       <bpmndi:BPMNShape bpmnElement="sid-01162014-E410-4093-B0BF-4DC735CE9D7B" id="BPMNShape_sid-01162014-E410-4093-B0BF-4DC735CE9D7B">
         <omgdc:Bounds height="40.0" width="40.0" x="435.0" y="235.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D" id="BPMNShape_sid-AA4E2369-207E-4521-ABDA-2143E78E7C2D">
+        <omgdc:Bounds height="40.0" width="40.0" x="750.0" y="154.99999999999997"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-DEDBD6B6-5348-494A-A212-18A171193232" id="BPMNShape_sid-DEDBD6B6-5348-494A-A212-18A171193232">
+        <omgdc:Bounds height="80.0" width="100.0" x="825.0" y="134.99999999999997"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-F39CE67A-02DA-44CB-A534-968088FC5F18" id="BPMNEdge_sid-F39CE67A-02DA-44CB-A534-968088FC5F18">
+        <omgdi:waypoint x="770.5" y="194.49999999999997"></omgdi:waypoint>
+        <omgdi:waypoint x="770.5" y="252.0"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0" y="252.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <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>
@@ -99,20 +119,20 @@
       <bpmndi:BPMNEdge bpmnElement="sid-12EF6884-8C49-425E-92E3-F158345B016D" id="BPMNEdge_sid-12EF6884-8C49-425E-92E3-F158345B016D">
         <omgdi:waypoint x="474.8478942793957" y="255.1521057206043"></omgdi:waypoint>
         <omgdi:waypoint x="650.1500244140625" y="252.0"></omgdi:waypoint>
-        <omgdi:waypoint x="845.0" y="252.0"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0" y="252.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-BB78E104-5EE5-462C-8332-9774206D19BA" id="BPMNEdge_sid-BB78E104-5EE5-462C-8332-9774206D19BA">
         <omgdi:waypoint x="59.99962276962535" y="178.106380303331"></omgdi:waypoint>
         <omgdi:waypoint x="95.35714285714297" y="178.35714285714297"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" id="BPMNEdge_sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D">
-        <omgdi:waypoint x="879.6397058823529" y="175.36029411764704"></omgdi:waypoint>
-        <omgdi:waypoint x="915.0003729405028" y="175.10218705882843"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-048E2CD6-94A7-4BF7-A5A4-0DD8AF6C9C63" id="BPMNEdge_sid-048E2CD6-94A7-4BF7-A5A4-0DD8AF6C9C63">
         <omgdi:waypoint x="456.1339604359627" y="236.1339604359627"></omgdi:waypoint>
         <omgdi:waypoint x="455.741951234879" y="215.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D" id="BPMNEdge_sid-D6E240CB-2B17-48AF-B6AE-C216841F2D4D">
+        <omgdi:waypoint x="999.6397058823529" y="175.36029411764704"></omgdi:waypoint>
+        <omgdi:waypoint x="1035.0003729405028" y="175.10218705882843"></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="455.0" y="115.0"></omgdi:waypoint>
@@ -128,29 +148,37 @@
         <omgdi:waypoint x="270.0" y="255.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163" id="BPMNEdge_sid-1E900E80-E7FB-4E3F-AB4F-84FD36F69163">
-        <omgdi:waypoint x="620.5555419921875" y="194.4444580078125"></omgdi:waypoint>
-        <omgdi:waypoint x="620.5555419921875" y="252.0"></omgdi:waypoint>
-        <omgdi:waypoint x="845.0" y="252.0"></omgdi:waypoint>
+        <omgdi:waypoint x="560.5555419921875" y="194.4444580078125"></omgdi:waypoint>
+        <omgdi:waypoint x="560.5555419921875" y="252.0"></omgdi:waypoint>
+        <omgdi:waypoint x="965.0" y="252.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-0F7FB010-0A59-4862-8046-36C4B320FB28" id="BPMNEdge_sid-0F7FB010-0A59-4862-8046-36C4B320FB28">
-        <omgdi:waypoint x="860.375" y="194.62499999999997"></omgdi:waypoint>
-        <omgdi:waypoint x="860.0980371217038" y="237.00032037932917"></omgdi:waypoint>
+        <omgdi:waypoint x="980.375" y="194.62499999999997"></omgdi:waypoint>
+        <omgdi:waypoint x="980.0980371217038" y="237.00032037932917"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A" id="BPMNEdge_sid-55958C51-2348-4DB4-A8EA-9C2605D72F9A">
-        <omgdi:waypoint x="775.0" y="175.18450184501845"></omgdi:waypoint>
-        <omgdi:waypoint x="840.425925925926" y="175.4259259259259"></omgdi:waypoint>
+        <omgdi:waypoint x="925.0" y="175.23696682464453"></omgdi:waypoint>
+        <omgdi:waypoint x="960.4047619047619" y="175.40476190476187"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01" id="BPMNEdge_sid-AE47F84C-5C42-48F0-B28B-BBC17E73FC01">
         <omgdi:waypoint x="370.0" y="255.18450184501845"></omgdi:waypoint>
         <omgdi:waypoint x="435.4259259259259" y="255.42592592592592"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-37BD7150-CF5D-4AA6-982D-B305AE720F99" id="BPMNEdge_sid-37BD7150-CF5D-4AA6-982D-B305AE720F99">
+        <omgdi:waypoint x="715.0" y="175.23696682464453"></omgdi:waypoint>
+        <omgdi:waypoint x="750.4047619047619" y="175.40476190476187"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46" id="BPMNEdge_sid-73C36D3C-6C4C-4B65-9502-D7B6BC4A5E46">
-        <omgdi:waypoint x="505.0" y="175.1510574018127"></omgdi:waypoint>
-        <omgdi:waypoint x="600.439393939394" y="175.43939393939394"></omgdi:waypoint>
+        <omgdi:waypoint x="505.0" y="175.23696682464455"></omgdi:waypoint>
+        <omgdi:waypoint x="540.4047619047619" y="175.4047619047619"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-002682E5-FF90-4A74-8707-0F8B98C09674" id="BPMNEdge_sid-002682E5-FF90-4A74-8707-0F8B98C09674">
-        <omgdi:waypoint x="639.5913461538462" y="175.40865384615384"></omgdi:waypoint>
-        <omgdi:waypoint x="675.0" y="175.23923444976077"></omgdi:waypoint>
+        <omgdi:waypoint x="579.5913461538462" y="175.40865384615384"></omgdi:waypoint>
+        <omgdi:waypoint x="615.0" y="175.23923444976074"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-1B585BE1-64A9-4B76-B863-B89E7E64D5F9" id="BPMNEdge_sid-1B585BE1-64A9-4B76-B863-B89E7E64D5F9">
+        <omgdi:waypoint x="789.5913461538462" y="175.4086538461538"></omgdi:waypoint>
+        <omgdi:waypoint x="825.0" y="175.23923444976074"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>