供方系统新工作流

src/main/java/com/common/workflow/service/activiti/ActivitiService.java

@@ -367,7 +367,7 @@ public class ActivitiService {
         }
         //按供应商名称查询
         if (!supplierName.isEmpty()) {
-            taskInstanceQuery = taskInstanceQuery.processVariableValueLike("supplierName", supplierName);
+            taskInstanceQuery = taskInstanceQuery.processVariableValueLikeIgnoreCase("supplierName", "%"+supplierName +"%");
         }
         //查询总条数
         long taskTotal = taskInstanceQuery.count();

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

@@ -27,8 +27,8 @@ spring:
             enabled: false
     datasource:
         type: com.zaxxer.hikari.HikariDataSource
-        # url: jdbc:mysql://47.92.212.59:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
-        url: jdbc:mysql://172.17.0.1: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://172.17.0.1:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         username: root
         password: zks123456
         hikari:

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

@@ -0,0 +1,67 @@
+<?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_register_apply" name="oil_register_apply" isExecutable="true">
+    <documentation>企业注册</documentation>
+    <startEvent id="startEvent1"></startEvent>
+    <userTask id="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7" name="企业注册" activiti:assignee="${recorder}">
+      <extensionElements>
+        <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <userTask id="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" name="二级单位审核" activiti:candidateUsers="${users}"></userTask>
+    <sequenceFlow id="sid-8D65972C-33B8-4CFD-8933-C212111CB9C0" sourceRef="startEvent1" targetRef="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7"></sequenceFlow>
+    <exclusiveGateway id="sid-3A1AC721-EA3D-4DEF-9DA4-815C5A3F4090"></exclusiveGateway>
+    <sequenceFlow id="sid-F1EA07DB-9009-4709-B7F3-C942BD09F244" sourceRef="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" targetRef="sid-3A1AC721-EA3D-4DEF-9DA4-815C5A3F4090"></sequenceFlow>
+    <endEvent id="sid-57B0C131-24E1-4682-BD87-5A472737ADA8"></endEvent>
+    <intermediateThrowEvent id="sid-BB64EFEE-154C-4689-813C-DFF0F59ABADC"></intermediateThrowEvent>
+    <sequenceFlow id="sid-23C065F7-26AA-4958-8D8B-556309990642" name="提交审核" sourceRef="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7" targetRef="sid-A5254E60-6970-43F6-9C70-95B54B27D57C"></sequenceFlow>
+    <sequenceFlow id="sid-0A46C6E2-2DE7-4CEB-8A11-C8AB75C40D19" name="审核通过" sourceRef="sid-3A1AC721-EA3D-4DEF-9DA4-815C5A3F4090" targetRef="sid-57B0C131-24E1-4682-BD87-5A472737ADA8">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-82725555-6ED3-459B-A0EF-281A51018605" name="审核不通过" sourceRef="sid-3A1AC721-EA3D-4DEF-9DA4-815C5A3F4090" targetRef="sid-BB64EFEE-154C-4689-813C-DFF0F59ABADC">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result!=1}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_oil_register_apply">
+    <bpmndi:BPMNPlane bpmnElement="oil_register_apply" id="BPMNPlane_oil_register_apply">
+      <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
+        <omgdc:Bounds height="30.0" width="30.0" x="90.0" y="150.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7" id="BPMNShape_sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7">
+        <omgdc:Bounds height="80.0" width="100.0" x="180.0" y="125.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" id="BPMNShape_sid-A5254E60-6970-43F6-9C70-95B54B27D57C">
+        <omgdc:Bounds height="80.0" width="100.0" x="360.0" y="125.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-3A1AC721-EA3D-4DEF-9DA4-815C5A3F4090" id="BPMNShape_sid-3A1AC721-EA3D-4DEF-9DA4-815C5A3F4090">
+        <omgdc:Bounds height="40.0" width="40.0" x="520.0" y="145.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-57B0C131-24E1-4682-BD87-5A472737ADA8" id="BPMNShape_sid-57B0C131-24E1-4682-BD87-5A472737ADA8">
+        <omgdc:Bounds height="28.0" width="28.0" x="630.0" y="151.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-BB64EFEE-154C-4689-813C-DFF0F59ABADC" id="BPMNShape_sid-BB64EFEE-154C-4689-813C-DFF0F59ABADC">
+        <omgdc:Bounds height="30.0" width="30.0" x="525.0" y="225.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-82725555-6ED3-459B-A0EF-281A51018605" id="BPMNEdge_sid-82725555-6ED3-459B-A0EF-281A51018605">
+        <omgdi:waypoint x="540.3716216216217" y="184.6283783783784"></omgdi:waypoint>
+        <omgdi:waypoint x="540.1006688737502" y="225.00033781120862"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-8D65972C-33B8-4CFD-8933-C212111CB9C0" id="BPMNEdge_sid-8D65972C-33B8-4CFD-8933-C212111CB9C0">
+        <omgdi:waypoint x="120.0" y="165.0"></omgdi:waypoint>
+        <omgdi:waypoint x="180.0" y="165.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-F1EA07DB-9009-4709-B7F3-C942BD09F244" id="BPMNEdge_sid-F1EA07DB-9009-4709-B7F3-C942BD09F244">
+        <omgdi:waypoint x="460.0" y="165.19157088122606"></omgdi:waypoint>
+        <omgdi:waypoint x="520.4230769230769" y="165.42307692307693"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-23C065F7-26AA-4958-8D8B-556309990642" id="BPMNEdge_sid-23C065F7-26AA-4958-8D8B-556309990642">
+        <omgdi:waypoint x="280.0" y="165.0"></omgdi:waypoint>
+        <omgdi:waypoint x="360.0" y="165.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-0A46C6E2-2DE7-4CEB-8A11-C8AB75C40D19" id="BPMNEdge_sid-0A46C6E2-2DE7-4CEB-8A11-C8AB75C40D19">
+        <omgdi:waypoint x="559.5922330097087" y="165.40776699029126"></omgdi:waypoint>
+        <omgdi:waypoint x="630.0001633615132" y="165.0676320610555"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

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

@@ -0,0 +1,45 @@
+<?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_supplier_instore" name="oil_supplier_instore" isExecutable="true">
+    <documentation>准入待入库工作流</documentation>
+    <startEvent id="startEvent1"></startEvent>
+    <userTask id="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7" name="待入库" activiti:assignee="${recorder}">
+      <extensionElements>
+        <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <userTask id="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" name="确认入库" activiti:candidateUsers="${users}"></userTask>
+    <sequenceFlow id="sid-8D65972C-33B8-4CFD-8933-C212111CB9C0" sourceRef="startEvent1" targetRef="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7"></sequenceFlow>
+    <sequenceFlow id="sid-23C065F7-26AA-4958-8D8B-556309990642" name="提交审核" sourceRef="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7" targetRef="sid-A5254E60-6970-43F6-9C70-95B54B27D57C"></sequenceFlow>
+    <endEvent id="sid-97315B96-83A8-452E-97CD-8868FF2F712F"></endEvent>
+    <sequenceFlow id="sid-F3C86B05-B5B9-4C5C-8574-96173EF4CB2D" sourceRef="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" targetRef="sid-97315B96-83A8-452E-97CD-8868FF2F712F"></sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_oil_supplier_instore">
+    <bpmndi:BPMNPlane bpmnElement="oil_supplier_instore" id="BPMNPlane_oil_supplier_instore">
+      <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
+        <omgdc:Bounds height="30.0" width="30.0" x="90.0" y="145.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7" id="BPMNShape_sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7">
+        <omgdc:Bounds height="80.0" width="100.0" x="180.0" y="120.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" id="BPMNShape_sid-A5254E60-6970-43F6-9C70-95B54B27D57C">
+        <omgdc:Bounds height="80.0" width="100.0" x="360.0" y="120.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-97315B96-83A8-452E-97CD-8868FF2F712F" id="BPMNShape_sid-97315B96-83A8-452E-97CD-8868FF2F712F">
+        <omgdc:Bounds height="28.0" width="28.0" x="510.0" y="146.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-8D65972C-33B8-4CFD-8933-C212111CB9C0" id="BPMNEdge_sid-8D65972C-33B8-4CFD-8933-C212111CB9C0">
+        <omgdi:waypoint x="120.0" y="160.0"></omgdi:waypoint>
+        <omgdi:waypoint x="180.0" y="160.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-23C065F7-26AA-4958-8D8B-556309990642" id="BPMNEdge_sid-23C065F7-26AA-4958-8D8B-556309990642">
+        <omgdi:waypoint x="280.0" y="160.0"></omgdi:waypoint>
+        <omgdi:waypoint x="360.0" y="160.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-F3C86B05-B5B9-4C5C-8574-96173EF4CB2D" id="BPMNEdge_sid-F3C86B05-B5B9-4C5C-8574-96173EF4CB2D">
+        <omgdi:waypoint x="460.0" y="160.0"></omgdi:waypoint>
+        <omgdi:waypoint x="510.0" y="160.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>