pom war

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.common.workflow</groupId>
     <artifactId>acti-api</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>Acti Api</name>
 
     <repositories>

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

@@ -85,9 +85,9 @@ spring:
         jobExecutorActivate: false
         asyncExecutorEnabled: false
         asyncExecutorActivate: false
-        database-schema-update: true
-        check-process-definitions: true
-        process-definition-location-prefix: classpath:/processes2/
+        database-schema-update: false
+        check-process-definitions: false
+        process-definition-location-prefix: classpath:/processes/
     #    process-definition-location-suffixes:
     #      - **.bpmn
     #      - **.bpmn20.xml

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

@@ -11,9 +11,7 @@
     <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>
-    <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>
     <userTask id="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" name="业务处室接收" activiti:candidateUsers="${users}"></userTask>
     <userTask id="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E" name="评审准入" activiti:assignee="${recorder}">
@@ -56,18 +54,27 @@
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-6A7B4FFF-D815-4522-93E3-ACA3E92104EE" sourceRef="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></sequenceFlow>
-    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    <sequenceFlow id="sid-D683E891-1671-40A6-9103-C03866D0640B" name="通过不缴费" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></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">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-D683E891-1671-40A6-9103-C03866D0640B" name="通过不缴费" sourceRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" targetRef="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
+    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-F49D476A-2CDD-4A35-8212-D88BA71F604E">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
+    <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
     <sequenceFlow id="sid-D6C377D7-98CC-4D68-B577-22E60AD1578A" name="不集中评审" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895">
+      <extensionElements>
+        <activiti:executionListener event="end" delegateExpression="${checkNeedPayService}"></activiti:executionListener>
+      </extensionElements>
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" sourceRef="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" targetRef="sid-025875DE-EAC2-4FBC-B4A4-91377D669895">
+      <extensionElements>
+        <activiti:executionListener event="end" delegateExpression="${checkNeedPayService}"></activiti:executionListener>
+      </extensionElements>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_oil_enuser_supplier_apply">
     <bpmndi:BPMNPlane bpmnElement="oil_enuser_supplier_apply" id="BPMNPlane_oil_enuser_supplier_apply">
@@ -98,9 +105,6 @@
       <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="1210.0" y="259.9999973509047"></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="1345.0" y="279.99999735090523"></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="1795.0" y="286.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
@@ -119,13 +123,16 @@
       <bpmndi:BPMNShape bpmnElement="sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600" id="BPMNShape_sid-FA63BEF0-2F3E-4A13-BEB8-286C4AA9F600">
         <omgdc:Bounds height="79.0" width="133.0526315789475" x="1609.9473684210525" y="261.0"></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="1345.0" y="279.99999735090523"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
         <omgdi:waypoint x="1100.0" y="299.9999973509049"></omgdi:waypoint>
         <omgdi:waypoint x="1135.0" y="299.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170" id="BPMNEdge_sid-FD0572E4-B0BC-49D2-9F15-C38057F3D170">
-        <omgdi:waypoint x="1365.6034566152896" y="319.39654073561576"></omgdi:waypoint>
-        <omgdi:waypoint x="1365.907958984375" y="375.01446533203125"></omgdi:waypoint>
+        <omgdi:waypoint x="1365.5" y="319.49999735090523"></omgdi:waypoint>
+        <omgdi:waypoint x="1365.5" y="375.01446533203125"></omgdi:waypoint>
         <omgdi:waypoint x="135.0" y="373.01446533203125"></omgdi:waypoint>
         <omgdi:waypoint x="135.0" y="335.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
@@ -164,8 +171,8 @@
         <omgdi:waypoint x="330.0" y="295.1930501930502"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-16929529-744D-4509-923E-820FA2E3AEE3" id="BPMNEdge_sid-16929529-744D-4509-923E-820FA2E3AEE3">
-        <omgdi:waypoint x="1384.5637580503242" y="300.43623930058106"></omgdi:waypoint>
-        <omgdi:waypoint x="1465.0" y="300.1672231942827"></omgdi:waypoint>
+        <omgdi:waypoint x="1384.1019783039494" y="300.8980190469557"></omgdi:waypoint>
+        <omgdi:waypoint x="1465.0" y="300.34302239075885"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-22C499F4-7179-4558-BC4C-77EF7453FA56" id="BPMNEdge_sid-22C499F4-7179-4558-BC4C-77EF7453FA56">
         <omgdi:waypoint x="965.0" y="299.9999973509052"></omgdi:waypoint>
@@ -192,12 +199,12 @@
         <omgdi:waypoint x="865.0" y="300.2392318006658"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
-        <omgdi:waypoint x="1310.0000000000002" y="300.23696417554953"></omgdi:waypoint>
-        <omgdi:waypoint x="1345.4047619047617" y="300.40475925566705"></omgdi:waypoint>
+        <omgdi:waypoint x="1310.0000000000002" y="300.4860824681864"></omgdi:waypoint>
+        <omgdi:waypoint x="1345.8344570423644" y="300.83445439326965"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-D683E891-1671-40A6-9103-C03866D0640B" id="BPMNEdge_sid-D683E891-1671-40A6-9103-C03866D0640B">
-        <omgdi:waypoint x="1367.2180750137968" y="282.2180723647021"></omgdi:waypoint>
-        <omgdi:waypoint x="1367.6116943359375" y="230.01446533203125"></omgdi:waypoint>
+        <omgdi:waypoint x="1367.1825678369623" y="282.18256518786757"></omgdi:waypoint>
+        <omgdi:waypoint x="1367.1825678369623" y="230.01446533203125"></omgdi:waypoint>
         <omgdi:waypoint x="1676.4736842105262" y="229.01446533203125"></omgdi:waypoint>
         <omgdi:waypoint x="1676.4736842105262" y="261.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
@@ -219,7 +226,7 @@
         <omgdi:waypoint x="1155.5" y="280.4999973509047"></omgdi:waypoint>
         <omgdi:waypoint x="1155.5" y="230.0162811279297"></omgdi:waypoint>
         <omgdi:waypoint x="1301.611328125" y="230.0162811279297"></omgdi:waypoint>
-        <omgdi:waypoint x="1355.5153437148356" y="289.4846536360696"></omgdi:waypoint>
+        <omgdi:waypoint x="1355.30530294893" y="289.69469440197537"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>