lining 6 anni fa
parent
commit
cd8c4c3357

+ 9 - 9
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?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
@@ -85,9 +85,9 @@ spring:
         jobExecutorActivate: false
         asyncExecutorEnabled: false
         asyncExecutorActivate: false
-        database-schema-update: false
-        check-process-definitions: false
-        process-definition-location-prefix: classpath:/processes2/
+        database-schema-update: true
+        check-process-definitions: true
+        process-definition-location-prefix: classpath:/processes_cellsop/
     #    process-definition-location-suffixes:
     #      - **.bpmn
     #      - **.bpmn20.xml

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

@@ -28,12 +28,12 @@ spring:
     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://39.98.34.197:3306/activiti_dqm?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
-        # username: dqmnt_user
-        # password: Y6Ba64w1Hezo
+        # url: jdbc:mysql://172.17.0.1:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
+        url: jdbc:mysql://39.98.34.197:3306/acticiti_cellsop?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         username: root
-        password: zks123456
+        password: Y6Ba64w1Hezo
+        # username: root
+        # password: zks123456
         hikari:
             auto-commit: false
             minimum-idle: 5
@@ -73,9 +73,9 @@ spring:
         jobExecutorActivate: false
         asyncExecutorEnabled: false
         asyncExecutorActivate: false
-        database-schema-update: false
-        check-process-definitions: false
-        process-definition-location-prefix: classpath:/processes/
+        database-schema-update: true
+        check-process-definitions: true
+        process-definition-location-prefix: classpath:/processes_cellsop/
     #    process-definition-location-suffixes:
     #      - **.bpmn
     #      - **.bpmn20.xml

+ 182 - 0
src/main/resources/processes_cellsop/cell_permit_through.bpmn20.xml

@@ -0,0 +1,182 @@
+<?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="cell_permit_through" name="cell_permit_through" isExecutable="true">
+    <startEvent id="startEvent1"></startEvent>
+    <userTask id="sid-8713C21D-6119-456A-B486-98EA6D7FBD46" 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-7A1E5434-7693-4BBC-BED9-7D5ABE1D5427" sourceRef="startEvent1" targetRef="sid-8713C21D-6119-456A-B486-98EA6D7FBD46"></sequenceFlow>
+    <userTask id="sid-8FE529FD-C7A2-433B-AD32-2CA5FAE07472" name="制备审核" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-E8B1EB32-7887-4CCE-B068-8CE58D108DBD" name="质检审核" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-2235DEB8-0BEF-4F7E-8991-532A1A5BACA0" name="QA审核" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-58BA1C4E-731E-4B7A-8DB8-45361B7B6E83" name="QA负责人审核" activiti:candidateUsers="${users}"></userTask>
+    <intermediateThrowEvent id="sid-AE7D10F1-5713-4885-BEAC-FDF35EE42715"></intermediateThrowEvent>
+    <exclusiveGateway id="sid-D926EA84-AE69-4AA4-B071-CB04A16660E8"></exclusiveGateway>
+    <sequenceFlow id="sid-800ED684-5E01-4B3A-B512-9220710BDB86" sourceRef="sid-8FE529FD-C7A2-433B-AD32-2CA5FAE07472" targetRef="sid-D926EA84-AE69-4AA4-B071-CB04A16660E8"></sequenceFlow>
+    <exclusiveGateway id="sid-6513EEF1-46F6-4C22-9AD2-458CDE0CB2ED"></exclusiveGateway>
+    <exclusiveGateway id="sid-B2457210-5966-47CD-8F7F-2135D88F1274"></exclusiveGateway>
+    <exclusiveGateway id="sid-DC19A4A4-CB08-468D-AFFF-8F3DDB390CE5"></exclusiveGateway>
+    <sequenceFlow id="sid-36C5AF8F-B6B2-4036-BDF2-20C7DF33C42B" sourceRef="sid-58BA1C4E-731E-4B7A-8DB8-45361B7B6E83" targetRef="sid-DC19A4A4-CB08-468D-AFFF-8F3DDB390CE5"></sequenceFlow>
+    <sequenceFlow id="sid-1F0E609E-DB7D-4D31-8E1B-6F99EEAB8DAC" sourceRef="sid-E8B1EB32-7887-4CCE-B068-8CE58D108DBD" targetRef="sid-6513EEF1-46F6-4C22-9AD2-458CDE0CB2ED"></sequenceFlow>
+    <parallelGateway id="sid-40A7AB64-09F7-421E-9A58-A018768F11A2"></parallelGateway>
+    <sequenceFlow id="sid-2DF04660-7B92-4D8D-B851-791F2FDDD928" sourceRef="sid-8713C21D-6119-456A-B486-98EA6D7FBD46" targetRef="sid-40A7AB64-09F7-421E-9A58-A018768F11A2"></sequenceFlow>
+    <parallelGateway id="sid-B66A2D48-BB19-4D5C-876A-5A2BCEA2194A"></parallelGateway>
+    <sequenceFlow id="sid-F6BE5B43-E851-4257-AC45-71E8B267412F" sourceRef="sid-40A7AB64-09F7-421E-9A58-A018768F11A2" targetRef="sid-E8B1EB32-7887-4CCE-B068-8CE58D108DBD">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==2}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-C5FFF16B-8C8E-46DC-8AA3-B191ACC907AB" sourceRef="sid-40A7AB64-09F7-421E-9A58-A018768F11A2" targetRef="sid-8FE529FD-C7A2-433B-AD32-2CA5FAE07472">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-81498155-8D38-4A7F-9834-8BE229AE2E5F" sourceRef="sid-D926EA84-AE69-4AA4-B071-CB04A16660E8" targetRef="sid-B66A2D48-BB19-4D5C-876A-5A2BCEA2194A">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-A6824A9B-5B95-4E46-82AF-60B393888A5A" name="未通过" sourceRef="sid-D926EA84-AE69-4AA4-B071-CB04A16660E8" targetRef="sid-8713C21D-6119-456A-B486-98EA6D7FBD46">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-99AFF6BE-A216-4666-ADA8-0B3BE6054692" sourceRef="sid-2235DEB8-0BEF-4F7E-8991-532A1A5BACA0" targetRef="sid-B2457210-5966-47CD-8F7F-2135D88F1274"></sequenceFlow>
+    <sequenceFlow id="sid-01EB0A6B-EF30-4A7B-BE53-08F140820DD0" name="通过" sourceRef="sid-DC19A4A4-CB08-468D-AFFF-8F3DDB390CE5" targetRef="sid-AE7D10F1-5713-4885-BEAC-FDF35EE42715">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-99B23C36-6217-4A48-BEF2-4CC7F6AA9C5A" name="通过" sourceRef="sid-B2457210-5966-47CD-8F7F-2135D88F1274" targetRef="sid-58BA1C4E-731E-4B7A-8DB8-45361B7B6E83">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-E8DED558-9D94-4039-8199-A927E39F1D1E" sourceRef="sid-B66A2D48-BB19-4D5C-876A-5A2BCEA2194A" targetRef="sid-2235DEB8-0BEF-4F7E-8991-532A1A5BACA0"></sequenceFlow>
+    <sequenceFlow id="sid-2D249520-C663-4665-9998-0B68FF1D876E" sourceRef="sid-6513EEF1-46F6-4C22-9AD2-458CDE0CB2ED" targetRef="sid-B66A2D48-BB19-4D5C-876A-5A2BCEA2194A">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-0A95EAEA-2D64-4272-A8A0-CE94BEB63F7B" name="未通过" sourceRef="sid-B2457210-5966-47CD-8F7F-2135D88F1274" targetRef="sid-8713C21D-6119-456A-B486-98EA6D7FBD46">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-A532E1ED-DE29-4F40-8FF0-3FC15CC22996" name="未通过" sourceRef="sid-6513EEF1-46F6-4C22-9AD2-458CDE0CB2ED" targetRef="sid-8713C21D-6119-456A-B486-98EA6D7FBD46">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-DF1DC781-11AC-42DA-BA0E-3B85995FCA76" name="未通过" sourceRef="sid-DC19A4A4-CB08-468D-AFFF-8F3DDB390CE5" targetRef="sid-8713C21D-6119-456A-B486-98EA6D7FBD46">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_cell_permit_through">
+    <bpmndi:BPMNPlane bpmnElement="cell_permit_through" id="BPMNPlane_cell_permit_through">
+      <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
+        <omgdc:Bounds height="30.0" width="30.0" x="0.0" y="163.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-8713C21D-6119-456A-B486-98EA6D7FBD46" id="BPMNShape_sid-8713C21D-6119-456A-B486-98EA6D7FBD46">
+        <omgdc:Bounds height="80.0" width="100.0" x="90.0" y="138.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-8FE529FD-C7A2-433B-AD32-2CA5FAE07472" id="BPMNShape_sid-8FE529FD-C7A2-433B-AD32-2CA5FAE07472">
+        <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="75.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-E8B1EB32-7887-4CCE-B068-8CE58D108DBD" id="BPMNShape_sid-E8B1EB32-7887-4CCE-B068-8CE58D108DBD">
+        <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="225.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-2235DEB8-0BEF-4F7E-8991-532A1A5BACA0" id="BPMNShape_sid-2235DEB8-0BEF-4F7E-8991-532A1A5BACA0">
+        <omgdc:Bounds height="80.0" width="100.0" x="600.0" y="138.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-58BA1C4E-731E-4B7A-8DB8-45361B7B6E83" id="BPMNShape_sid-58BA1C4E-731E-4B7A-8DB8-45361B7B6E83">
+        <omgdc:Bounds height="80.0" width="100.0" x="840.0" y="138.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-AE7D10F1-5713-4885-BEAC-FDF35EE42715" id="BPMNShape_sid-AE7D10F1-5713-4885-BEAC-FDF35EE42715">
+        <omgdc:Bounds height="30.0" width="30.0" x="1065.0" y="163.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-D926EA84-AE69-4AA4-B071-CB04A16660E8" id="BPMNShape_sid-D926EA84-AE69-4AA4-B071-CB04A16660E8">
+        <omgdc:Bounds height="40.0" width="40.0" x="420.0" y="95.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-6513EEF1-46F6-4C22-9AD2-458CDE0CB2ED" id="BPMNShape_sid-6513EEF1-46F6-4C22-9AD2-458CDE0CB2ED">
+        <omgdc:Bounds height="40.0" width="40.0" x="420.0" y="245.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-B2457210-5966-47CD-8F7F-2135D88F1274" id="BPMNShape_sid-B2457210-5966-47CD-8F7F-2135D88F1274">
+        <omgdc:Bounds height="40.0" width="40.0" x="750.0" y="158.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-DC19A4A4-CB08-468D-AFFF-8F3DDB390CE5" id="BPMNShape_sid-DC19A4A4-CB08-468D-AFFF-8F3DDB390CE5">
+        <omgdc:Bounds height="40.0" width="40.0" x="975.0" y="158.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-40A7AB64-09F7-421E-9A58-A018768F11A2" id="BPMNShape_sid-40A7AB64-09F7-421E-9A58-A018768F11A2">
+        <omgdc:Bounds height="40.0" width="40.0" x="225.0" y="158.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-B66A2D48-BB19-4D5C-876A-5A2BCEA2194A" id="BPMNShape_sid-B66A2D48-BB19-4D5C-876A-5A2BCEA2194A">
+        <omgdc:Bounds height="40.0" width="40.0" x="495.0" y="160.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-DF1DC781-11AC-42DA-BA0E-3B85995FCA76" id="BPMNEdge_sid-DF1DC781-11AC-42DA-BA0E-3B85995FCA76">
+        <omgdi:waypoint x="995.5" y="158.5"></omgdi:waypoint>
+        <omgdi:waypoint x="995.5" y="61.0"></omgdi:waypoint>
+        <omgdi:waypoint x="138.0" y="61.0"></omgdi:waypoint>
+        <omgdi:waypoint x="139.31623931623932" y="138.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-36C5AF8F-B6B2-4036-BDF2-20C7DF33C42B" id="BPMNEdge_sid-36C5AF8F-B6B2-4036-BDF2-20C7DF33C42B">
+        <omgdi:waypoint x="940.0" y="178.23696682464455"></omgdi:waypoint>
+        <omgdi:waypoint x="975.4047619047619" y="178.4047619047619"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-81498155-8D38-4A7F-9834-8BE229AE2E5F" id="BPMNEdge_sid-81498155-8D38-4A7F-9834-8BE229AE2E5F">
+        <omgdi:waypoint x="459.5" y="115.5"></omgdi:waypoint>
+        <omgdi:waypoint x="515.0" y="115.5"></omgdi:waypoint>
+        <omgdi:waypoint x="515.0" y="160.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-E8DED558-9D94-4039-8199-A927E39F1D1E" id="BPMNEdge_sid-E8DED558-9D94-4039-8199-A927E39F1D1E">
+        <omgdi:waypoint x="534.8598484848485" y="180.1401515151515"></omgdi:waypoint>
+        <omgdi:waypoint x="600.0" y="178.92936802973978"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-0A95EAEA-2D64-4272-A8A0-CE94BEB63F7B" id="BPMNEdge_sid-0A95EAEA-2D64-4272-A8A0-CE94BEB63F7B">
+        <omgdi:waypoint x="770.5" y="197.5"></omgdi:waypoint>
+        <omgdi:waypoint x="770.5" y="333.0"></omgdi:waypoint>
+        <omgdi:waypoint x="140.0" y="333.0"></omgdi:waypoint>
+        <omgdi:waypoint x="140.0" y="218.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-F6BE5B43-E851-4257-AC45-71E8B267412F" id="BPMNEdge_sid-F6BE5B43-E851-4257-AC45-71E8B267412F">
+        <omgdi:waypoint x="245.5" y="197.5"></omgdi:waypoint>
+        <omgdi:waypoint x="245.5" y="265.0"></omgdi:waypoint>
+        <omgdi:waypoint x="270.0" y="265.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C5FFF16B-8C8E-46DC-8AA3-B191ACC907AB" id="BPMNEdge_sid-C5FFF16B-8C8E-46DC-8AA3-B191ACC907AB">
+        <omgdi:waypoint x="245.5" y="158.5"></omgdi:waypoint>
+        <omgdi:waypoint x="245.5" y="115.0"></omgdi:waypoint>
+        <omgdi:waypoint x="270.0" y="115.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-800ED684-5E01-4B3A-B512-9220710BDB86" id="BPMNEdge_sid-800ED684-5E01-4B3A-B512-9220710BDB86">
+        <omgdi:waypoint x="370.0" y="115.20746887966806"></omgdi:waypoint>
+        <omgdi:waypoint x="420.4166666666667" y="115.41666666666667"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-99B23C36-6217-4A48-BEF2-4CC7F6AA9C5A" id="BPMNEdge_sid-99B23C36-6217-4A48-BEF2-4CC7F6AA9C5A">
+        <omgdi:waypoint x="789.5798319327731" y="178.42016806722688"></omgdi:waypoint>
+        <omgdi:waypoint x="840.0" y="178.2092050209205"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2D249520-C663-4665-9998-0B68FF1D876E" id="BPMNEdge_sid-2D249520-C663-4665-9998-0B68FF1D876E">
+        <omgdi:waypoint x="459.5" y="265.5"></omgdi:waypoint>
+        <omgdi:waypoint x="515.0" y="265.5"></omgdi:waypoint>
+        <omgdi:waypoint x="515.0" y="200.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-99AFF6BE-A216-4666-ADA8-0B3BE6054692" id="BPMNEdge_sid-99AFF6BE-A216-4666-ADA8-0B3BE6054692">
+        <omgdi:waypoint x="700.0" y="178.20746887966806"></omgdi:waypoint>
+        <omgdi:waypoint x="750.4166666666666" y="178.41666666666666"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A532E1ED-DE29-4F40-8FF0-3FC15CC22996" id="BPMNEdge_sid-A532E1ED-DE29-4F40-8FF0-3FC15CC22996">
+        <omgdi:waypoint x="440.5" y="284.5"></omgdi:waypoint>
+        <omgdi:waypoint x="440.5" y="334.0"></omgdi:waypoint>
+        <omgdi:waypoint x="140.0" y="334.0"></omgdi:waypoint>
+        <omgdi:waypoint x="140.0" y="218.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2DF04660-7B92-4D8D-B851-791F2FDDD928" id="BPMNEdge_sid-2DF04660-7B92-4D8D-B851-791F2FDDD928">
+        <omgdi:waypoint x="190.0" y="178.0"></omgdi:waypoint>
+        <omgdi:waypoint x="225.0" y="178.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A6824A9B-5B95-4E46-82AF-60B393888A5A" id="BPMNEdge_sid-A6824A9B-5B95-4E46-82AF-60B393888A5A">
+        <omgdi:waypoint x="440.5" y="95.5"></omgdi:waypoint>
+        <omgdi:waypoint x="440.5" y="61.0"></omgdi:waypoint>
+        <omgdi:waypoint x="140.0" y="61.0"></omgdi:waypoint>
+        <omgdi:waypoint x="140.0" y="138.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-01EB0A6B-EF30-4A7B-BE53-08F140820DD0" id="BPMNEdge_sid-01EB0A6B-EF30-4A7B-BE53-08F140820DD0">
+        <omgdi:waypoint x="1014.6130952380952" y="178.38690476190476"></omgdi:waypoint>
+        <omgdi:waypoint x="1065.000262588952" y="178.08875584266895"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-1F0E609E-DB7D-4D31-8E1B-6F99EEAB8DAC" id="BPMNEdge_sid-1F0E609E-DB7D-4D31-8E1B-6F99EEAB8DAC">
+        <omgdi:waypoint x="370.0" y="265.20746887966806"></omgdi:waypoint>
+        <omgdi:waypoint x="420.4166666666667" y="265.4166666666667"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7A1E5434-7693-4BBC-BED9-7D5ABE1D5427" id="BPMNEdge_sid-7A1E5434-7693-4BBC-BED9-7D5ABE1D5427">
+        <omgdi:waypoint x="30.0" y="178.0"></omgdi:waypoint>
+        <omgdi:waypoint x="90.0" y="178.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

+ 78 - 0
src/main/resources/processes_cellsop/cell_solution.bpmn20.xml

@@ -0,0 +1,78 @@
+<?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="cell_solution" name="cell_solution" isExecutable="true">
+    <documentation>测试</documentation>
+    <startEvent id="startEvent1" name="开始"></startEvent>
+    <userTask id="sid-876E0F6F-1167-4EBC-9CDF-3FD8DF7B5133" name="提交申请" activiti:assignee="${recorder}">
+      <extensionElements>
+        <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[true]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <sequenceFlow id="sid-48792573-ACA1-41BB-8ACE-09B1435AA52D" sourceRef="startEvent1" targetRef="sid-876E0F6F-1167-4EBC-9CDF-3FD8DF7B5133"></sequenceFlow>
+    <endEvent id="sid-993D6E3B-FFAF-41AA-9410-EB4101B16EE9" name="完成"></endEvent>
+    <userTask id="sid-8AA40D71-92CE-4858-B77E-49AD8A4B6582" name="审核">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${users}" activiti:elementVariable="user"></multiInstanceLoopCharacteristics>
+    </userTask>
+    <sequenceFlow id="sid-6FE24807-0694-448B-B50E-B3A33E7ACAEE" sourceRef="sid-876E0F6F-1167-4EBC-9CDF-3FD8DF7B5133" targetRef="sid-8AA40D71-92CE-4858-B77E-49AD8A4B6582"></sequenceFlow>
+    <exclusiveGateway id="sid-CE891333-B53F-4317-8764-4422AF0C63B5"></exclusiveGateway>
+    <sequenceFlow id="sid-BBA469E2-686A-48D5-8B65-CBB9D97F3E67" sourceRef="sid-8AA40D71-92CE-4858-B77E-49AD8A4B6582" targetRef="sid-CE891333-B53F-4317-8764-4422AF0C63B5"></sequenceFlow>
+    <intermediateThrowEvent id="sid-2386034D-8C60-4B4A-873C-E07E2070FC84" name="流程终止"></intermediateThrowEvent>
+    <sequenceFlow id="sid-AFC3683D-4A18-4002-AE31-7EC00C210659" name="退回" sourceRef="sid-CE891333-B53F-4317-8764-4422AF0C63B5" targetRef="sid-876E0F6F-1167-4EBC-9CDF-3FD8DF7B5133">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-5BA1A0BE-15E5-49B7-B285-EC5A5F608FDF" name="未通过" sourceRef="sid-CE891333-B53F-4317-8764-4422AF0C63B5" targetRef="sid-2386034D-8C60-4B4A-873C-E07E2070FC84">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==-1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-A0CEDC9E-89E1-42D4-8F9D-2C410A4A34A3" name="通过" sourceRef="sid-CE891333-B53F-4317-8764-4422AF0C63B5" targetRef="sid-993D6E3B-FFAF-41AA-9410-EB4101B16EE9">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_cell_solution">
+    <bpmndi:BPMNPlane bpmnElement="cell_solution" id="BPMNPlane_cell_solution">
+      <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
+        <omgdc:Bounds height="30.0" width="30.0" x="100.0" y="310.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-876E0F6F-1167-4EBC-9CDF-3FD8DF7B5133" id="BPMNShape_sid-876E0F6F-1167-4EBC-9CDF-3FD8DF7B5133">
+        <omgdc:Bounds height="80.0" width="100.0" x="180.0" y="285.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-993D6E3B-FFAF-41AA-9410-EB4101B16EE9" id="BPMNShape_sid-993D6E3B-FFAF-41AA-9410-EB4101B16EE9">
+        <omgdc:Bounds height="28.0" width="28.0" x="675.0" y="311.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-8AA40D71-92CE-4858-B77E-49AD8A4B6582" id="BPMNShape_sid-8AA40D71-92CE-4858-B77E-49AD8A4B6582">
+        <omgdc:Bounds height="80.0" width="100.0" x="390.0" y="285.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-CE891333-B53F-4317-8764-4422AF0C63B5" id="BPMNShape_sid-CE891333-B53F-4317-8764-4422AF0C63B5">
+        <omgdc:Bounds height="40.0" width="40.0" x="580.0" y="305.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-2386034D-8C60-4B4A-873C-E07E2070FC84" id="BPMNShape_sid-2386034D-8C60-4B4A-873C-E07E2070FC84">
+        <omgdc:Bounds height="30.0" width="30.0" x="585.0" y="405.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-BBA469E2-686A-48D5-8B65-CBB9D97F3E67" id="BPMNEdge_sid-BBA469E2-686A-48D5-8B65-CBB9D97F3E67">
+        <omgdi:waypoint x="490.0" y="325.1557632398754"></omgdi:waypoint>
+        <omgdi:waypoint x="580.4375" y="325.4375"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-AFC3683D-4A18-4002-AE31-7EC00C210659" id="BPMNEdge_sid-AFC3683D-4A18-4002-AE31-7EC00C210659">
+        <omgdi:waypoint x="600.5" y="305.5"></omgdi:waypoint>
+        <omgdi:waypoint x="600.5" y="232.0"></omgdi:waypoint>
+        <omgdi:waypoint x="230.0" y="232.0"></omgdi:waypoint>
+        <omgdi:waypoint x="230.0" y="285.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-5BA1A0BE-15E5-49B7-B285-EC5A5F608FDF" id="BPMNEdge_sid-5BA1A0BE-15E5-49B7-B285-EC5A5F608FDF">
+        <omgdi:waypoint x="600.3989361702128" y="344.6010638297872"></omgdi:waypoint>
+        <omgdi:waypoint x="600.0793639684862" y="405.0002099561192"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-6FE24807-0694-448B-B50E-B3A33E7ACAEE" id="BPMNEdge_sid-6FE24807-0694-448B-B50E-B3A33E7ACAEE">
+        <omgdi:waypoint x="280.0" y="325.0"></omgdi:waypoint>
+        <omgdi:waypoint x="390.0" y="325.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-48792573-ACA1-41BB-8ACE-09B1435AA52D" id="BPMNEdge_sid-48792573-ACA1-41BB-8ACE-09B1435AA52D">
+        <omgdi:waypoint x="130.0" y="325.0"></omgdi:waypoint>
+        <omgdi:waypoint x="180.0" y="325.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A0CEDC9E-89E1-42D4-8F9D-2C410A4A34A3" id="BPMNEdge_sid-A0CEDC9E-89E1-42D4-8F9D-2C410A4A34A3">
+        <omgdi:waypoint x="620.0" y="325.0"></omgdi:waypoint>
+        <omgdi:waypoint x="675.0" y="325.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

+ 91 - 30
src/main/resources/processes_cellsop/cellsop_flow.bpmn20.xml

@@ -7,7 +7,6 @@
     <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="交接" activiti:candidateUsers="${users}"></userTask>
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D" name="完成"></endEvent>
     <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-E19E2941-6B2A-4114-B292-5D789BA0959A" sourceRef="sid-79AD32BB-7257-4652-A5C5-5F020A423D98" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></sequenceFlow>
     <userTask id="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" name="制备(检测)" activiti:candidateUsers="${users}"></userTask>
     <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="项目" activiti:assignee="${recorder}">
       <extensionElements>
@@ -18,15 +17,37 @@
     <sequenceFlow id="sid-42E794AB-A831-42E1-B9C0-D719096AC5AB" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-CF73C362-1009-4DAD-987D-FE8E5DEAF9B3"></sequenceFlow>
     <userTask id="sid-EADEE400-777A-4043-ADA6-07477CA5CAF3" name="采集审核" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-751C74A7-6447-45F4-9161-19A3B05EA484" sourceRef="sid-CF73C362-1009-4DAD-987D-FE8E5DEAF9B3" targetRef="sid-EADEE400-777A-4043-ADA6-07477CA5CAF3"></sequenceFlow>
-    <sequenceFlow id="sid-EFB486FB-44ED-4DBD-8B2A-0D0D38D6DE04" sourceRef="sid-EADEE400-777A-4043-ADA6-07477CA5CAF3" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546"></sequenceFlow>
     <userTask id="sid-C24945E8-4DCF-4EAE-B7B7-B23E366637AF" name="交接审核" activiti:candidateUsers="${users}"></userTask>
-    <sequenceFlow id="sid-64940E6C-B163-45FB-AA86-FDF5F3A306B6" sourceRef="sid-C24945E8-4DCF-4EAE-B7B7-B23E366637AF" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066"></sequenceFlow>
     <userTask id="sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13" name="制备审核" activiti:candidateUsers="${users}"></userTask>
-    <sequenceFlow id="sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13"></sequenceFlow>
     <sequenceFlow id="sid-6B313E7B-4F8C-47A7-8A3B-BFE343F700A2" sourceRef="sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></sequenceFlow>
     <sequenceFlow id="sid-2E2450DC-395A-40A2-889A-66B86FC52FF4" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-C24945E8-4DCF-4EAE-B7B7-B23E366637AF"></sequenceFlow>
     <userTask id="sid-79AD32BB-7257-4652-A5C5-5F020A423D98" name="放行审核" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-FB7F9CEE-2987-4E63-8B83-D12766221D63"></exclusiveGateway>
+    <sequenceFlow id="sid-A07C35BB-322D-435B-AD9A-5A07EE58E4A0" sourceRef="sid-EADEE400-777A-4043-ADA6-07477CA5CAF3" targetRef="sid-FB7F9CEE-2987-4E63-8B83-D12766221D63"></sequenceFlow>
+    <exclusiveGateway id="sid-BB1D7F6C-669C-4B7B-9829-BAEB317CD015"></exclusiveGateway>
+    <sequenceFlow id="sid-9AC18539-BE20-419F-ADA3-61EE18A8E0E3" sourceRef="sid-C24945E8-4DCF-4EAE-B7B7-B23E366637AF" targetRef="sid-BB1D7F6C-669C-4B7B-9829-BAEB317CD015"></sequenceFlow>
+    <sequenceFlow id="sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13"></sequenceFlow>
+    <exclusiveGateway id="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D"></exclusiveGateway>
     <sequenceFlow id="sid-53E8341C-35AA-49D4-B9A0-274545608FE6" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-79AD32BB-7257-4652-A5C5-5F020A423D98"></sequenceFlow>
+    <sequenceFlow id="sid-7870BC74-6767-4872-8046-F9850BF09E25" sourceRef="sid-79AD32BB-7257-4652-A5C5-5F020A423D98" targetRef="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D"></sequenceFlow>
+    <sequenceFlow id="sid-7A95138B-7055-403B-9395-8F95A4C24B3A" name="通过" sourceRef="sid-FB7F9CEE-2987-4E63-8B83-D12766221D63" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-0F9E1B09-56E1-4A1E-8B42-8B4300824CCC" name="未通过" sourceRef="sid-FB7F9CEE-2987-4E63-8B83-D12766221D63" targetRef="sid-CF73C362-1009-4DAD-987D-FE8E5DEAF9B3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-1C0B7DC3-9F10-47AE-B845-625A7DC342E3" name="通过" sourceRef="sid-BB1D7F6C-669C-4B7B-9829-BAEB317CD015" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-7C8DA490-40A3-4C5A-864B-1AD0EBB0AF68" name="未通过" sourceRef="sid-BB1D7F6C-669C-4B7B-9829-BAEB317CD015" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-A51E7105-0DEF-4153-AA5E-304E30AED30F" name="通过" sourceRef="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-C359B02F-5369-4CA5-B9B4-5012FE846ABC" name="未通过" sourceRef="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_cellsop_flow">
     <bpmndi:BPMNPlane bpmnElement="cellsop_flow" id="BPMNPlane_cellsop_flow">
@@ -34,16 +55,16 @@
         <omgdc:Bounds height="30.0" width="30.0" x="45.0" y="120.0"></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="480.0" y="255.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="599.9999869953505" y="289.0"></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="100.0" x="645.0" y="95.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="705.0" y="95.0"></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="195.0" y="281.0"></omgdc:Bounds>
+        <omgdc:Bounds height="28.0" width="28.0" x="46.0" y="315.0"></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="825.0" y="255.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="1022.7272505602566" y="289.0"></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="135.0" y="95.0"></omgdc:Bounds>
@@ -55,17 +76,26 @@
         <omgdc:Bounds height="80.0" width="100.0" x="480.0" y="95.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-C24945E8-4DCF-4EAE-B7B7-B23E366637AF" id="BPMNShape_sid-C24945E8-4DCF-4EAE-B7B7-B23E366637AF">
-        <omgdc:Bounds height="80.0" width="100.0" x="825.0" y="95.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="855.0" y="95.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13" id="BPMNShape_sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13">
-        <omgdc:Bounds height="80.0" width="100.0" x="645.0" y="255.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="804.5454371074018" y="289.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-79AD32BB-7257-4652-A5C5-5F020A423D98" id="BPMNShape_sid-79AD32BB-7257-4652-A5C5-5F020A423D98">
-        <omgdc:Bounds height="80.0" width="100.0" x="300.0" y="255.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="395.4545368832992" y="289.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-FB7F9CEE-2987-4E63-8B83-D12766221D63" id="BPMNShape_sid-FB7F9CEE-2987-4E63-8B83-D12766221D63">
+        <omgdc:Bounds height="40.0" width="40.0" x="615.0" y="115.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-BB1D7F6C-669C-4B7B-9829-BAEB317CD015" id="BPMNShape_sid-BB1D7F6C-669C-4B7B-9829-BAEB317CD015">
+        <omgdc:Bounds height="40.0" width="40.0" x="990.0" y="115.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D" id="BPMNShape_sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D">
+        <omgdc:Bounds height="40.0" width="40.0" x="272.72726681606844" y="309.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-6B313E7B-4F8C-47A7-8A3B-BFE343F700A2" id="BPMNEdge_sid-6B313E7B-4F8C-47A7-8A3B-BFE343F700A2">
-        <omgdi:waypoint x="645.0" y="295.0"></omgdi:waypoint>
-        <omgdi:waypoint x="580.0" y="295.0"></omgdi:waypoint>
+        <omgdi:waypoint x="804.5454371074018" y="329.0"></omgdi:waypoint>
+        <omgdi:waypoint x="699.9999869953505" y="329.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-842910A7-33C0-4DC1-B663-84C688761DA7" id="BPMNEdge_sid-842910A7-33C0-4DC1-B663-84C688761DA7">
         <omgdi:waypoint x="75.0" y="135.0"></omgdi:waypoint>
@@ -75,33 +105,64 @@
         <omgdi:waypoint x="409.0" y="135.0"></omgdi:waypoint>
         <omgdi:waypoint x="480.0" y="135.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714" id="BPMNEdge_sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714">
-        <omgdi:waypoint x="825.0" y="295.0"></omgdi:waypoint>
-        <omgdi:waypoint x="745.0" y="295.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-2E2450DC-395A-40A2-889A-66B86FC52FF4" id="BPMNEdge_sid-2E2450DC-395A-40A2-889A-66B86FC52FF4">
-        <omgdi:waypoint x="745.0" y="135.0"></omgdi:waypoint>
-        <omgdi:waypoint x="825.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="805.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="855.0" y="135.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7870BC74-6767-4872-8046-F9850BF09E25" id="BPMNEdge_sid-7870BC74-6767-4872-8046-F9850BF09E25">
+        <omgdi:waypoint x="395.4545368832992" y="329.1642281306691"></omgdi:waypoint>
+        <omgdi:waypoint x="312.2898791598863" y="329.4373876561821"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-1C0B7DC3-9F10-47AE-B845-625A7DC342E3" id="BPMNEdge_sid-1C0B7DC3-9F10-47AE-B845-625A7DC342E3">
+        <omgdi:waypoint x="1029.5" y="135.5"></omgdi:waypoint>
+        <omgdi:waypoint x="1072.7272505602566" y="135.5"></omgdi:waypoint>
+        <omgdi:waypoint x="1072.7272505602566" y="289.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-42E794AB-A831-42E1-B9C0-D719096AC5AB" id="BPMNEdge_sid-42E794AB-A831-42E1-B9C0-D719096AC5AB">
         <omgdi:waypoint x="235.0" y="135.0"></omgdi:waypoint>
         <omgdi:waypoint x="309.0" y="135.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A07C35BB-322D-435B-AD9A-5A07EE58E4A0" id="BPMNEdge_sid-A07C35BB-322D-435B-AD9A-5A07EE58E4A0">
+        <omgdi:waypoint x="580.0" y="135.23696682464455"></omgdi:waypoint>
+        <omgdi:waypoint x="615.4047619047619" y="135.4047619047619"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7A95138B-7055-403B-9395-8F95A4C24B3A" id="BPMNEdge_sid-7A95138B-7055-403B-9395-8F95A4C24B3A">
+        <omgdi:waypoint x="654.5798319327731" y="135.42016806722688"></omgdi:waypoint>
+        <omgdi:waypoint x="705.0" y="135.2092050209205"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A51E7105-0DEF-4153-AA5E-304E30AED30F" id="BPMNEdge_sid-A51E7105-0DEF-4153-AA5E-304E30AED30F">
+        <omgdi:waypoint x="273.18429806497704" y="329.4570312489086"></omgdi:waypoint>
+        <omgdi:waypoint x="73.9999678280114" y="329.0300135743542"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714" id="BPMNEdge_sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714">
+        <omgdi:waypoint x="1022.7272505602566" y="329.0"></omgdi:waypoint>
+        <omgdi:waypoint x="904.5454371074018" y="329.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-0F9E1B09-56E1-4A1E-8B42-8B4300824CCC" id="BPMNEdge_sid-0F9E1B09-56E1-4A1E-8B42-8B4300824CCC">
+        <omgdi:waypoint x="635.5" y="154.5"></omgdi:waypoint>
+        <omgdi:waypoint x="635.5" y="209.0"></omgdi:waypoint>
+        <omgdi:waypoint x="359.0" y="209.0"></omgdi:waypoint>
+        <omgdi:waypoint x="359.0" y="175.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-53E8341C-35AA-49D4-B9A0-274545608FE6" id="BPMNEdge_sid-53E8341C-35AA-49D4-B9A0-274545608FE6">
-        <omgdi:waypoint x="480.0" y="295.0"></omgdi:waypoint>
-        <omgdi:waypoint x="400.0" y="295.0"></omgdi:waypoint>
+        <omgdi:waypoint x="599.9999869953505" y="329.0"></omgdi:waypoint>
+        <omgdi:waypoint x="495.4545368832992" y="329.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-64940E6C-B163-45FB-AA86-FDF5F3A306B6" id="BPMNEdge_sid-64940E6C-B163-45FB-AA86-FDF5F3A306B6">
-        <omgdi:waypoint x="875.0" y="175.0"></omgdi:waypoint>
-        <omgdi:waypoint x="875.0" y="255.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-9AC18539-BE20-419F-ADA3-61EE18A8E0E3" id="BPMNEdge_sid-9AC18539-BE20-419F-ADA3-61EE18A8E0E3">
+        <omgdi:waypoint x="955.0" y="135.23696682464455"></omgdi:waypoint>
+        <omgdi:waypoint x="990.4047619047619" y="135.4047619047619"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-E19E2941-6B2A-4114-B292-5D789BA0959A" id="BPMNEdge_sid-E19E2941-6B2A-4114-B292-5D789BA0959A">
-        <omgdi:waypoint x="300.0" y="295.0"></omgdi:waypoint>
-        <omgdi:waypoint x="223.0" y="295.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-C359B02F-5369-4CA5-B9B4-5012FE846ABC" id="BPMNEdge_sid-C359B02F-5369-4CA5-B9B4-5012FE846ABC">
+        <omgdi:waypoint x="293.22726681606844" y="348.5"></omgdi:waypoint>
+        <omgdi:waypoint x="293.22726681606844" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="649.9999869953505" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="649.9999869953505" y="369.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-EFB486FB-44ED-4DBD-8B2A-0D0D38D6DE04" id="BPMNEdge_sid-EFB486FB-44ED-4DBD-8B2A-0D0D38D6DE04">
-        <omgdi:waypoint x="580.0" y="135.0"></omgdi:waypoint>
-        <omgdi:waypoint x="645.0" y="135.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-7C8DA490-40A3-4C5A-864B-1AD0EBB0AF68" id="BPMNEdge_sid-7C8DA490-40A3-4C5A-864B-1AD0EBB0AF68">
+        <omgdi:waypoint x="1010.5" y="154.5"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.5" y="210.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="210.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0" y="175.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

+ 92 - 0
src/main/resources/processes_cellsop/cellsop_flow_short.bpmn20.xml

@@ -0,0 +1,92 @@
+<?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="cellsop_flow_short" name="cellsop_flow_short" isExecutable="true">
+    <documentation>cellsop整体流程</documentation>
+    <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
+    <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="成品放行" activiti:candidateUsers="${users}"></userTask>
+    <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D" name="完成"></endEvent>
+    <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
+    <userTask id="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" name="制备(检测)" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" 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-C3B7283D-CFA8-436C-AE2C-E9600BA97F13" name="制备审核" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-79AD32BB-7257-4652-A5C5-5F020A423D98" name="放行审核" activiti:candidateUsers="${users}"></userTask>
+    <sequenceFlow id="sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714" sourceRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066" targetRef="sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13"></sequenceFlow>
+    <exclusiveGateway id="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D"></exclusiveGateway>
+    <sequenceFlow id="sid-53E8341C-35AA-49D4-B9A0-274545608FE6" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-79AD32BB-7257-4652-A5C5-5F020A423D98"></sequenceFlow>
+    <sequenceFlow id="sid-A51E7105-0DEF-4153-AA5E-304E30AED30F" name="通过" sourceRef="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D" targetRef="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-42E794AB-A831-42E1-B9C0-D719096AC5AB" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-C18EB968-3E14-4BAF-9DEF-D767CA546066"></sequenceFlow>
+    <sequenceFlow id="sid-6B313E7B-4F8C-47A7-8A3B-BFE343F700A2" sourceRef="sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF"></sequenceFlow>
+    <sequenceFlow id="sid-C359B02F-5369-4CA5-B9B4-5012FE846ABC" name="未通过" sourceRef="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-7870BC74-6767-4872-8046-F9850BF09E25" sourceRef="sid-79AD32BB-7257-4652-A5C5-5F020A423D98" targetRef="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D"></sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_cellsop_flow_short">
+    <bpmndi:BPMNPlane bpmnElement="cellsop_flow_short" id="BPMNPlane_cellsop_flow_short">
+      <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="45.0" y="120.0"></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.0" width="100.0" x="660.0" y="95.0"></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="1155.0" y="121.0"></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="315.0" y="95.0"></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="135.0" y="95.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13" id="BPMNShape_sid-C3B7283D-CFA8-436C-AE2C-E9600BA97F13">
+        <omgdc:Bounds height="80.0" width="100.0" x="480.0" y="95.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-79AD32BB-7257-4652-A5C5-5F020A423D98" id="BPMNShape_sid-79AD32BB-7257-4652-A5C5-5F020A423D98">
+        <omgdc:Bounds height="80.0" width="100.0" x="840.0" y="95.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D" id="BPMNShape_sid-A5A2FE40-EEBA-4811-8F04-9B3781D8B08D">
+        <omgdc:Bounds height="40.0" width="40.0" x="1035.0" y="115.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-A51E7105-0DEF-4153-AA5E-304E30AED30F" id="BPMNEdge_sid-A51E7105-0DEF-4153-AA5E-304E30AED30F">
+        <omgdi:waypoint x="1074.58407079646" y="135.41592920353983"></omgdi:waypoint>
+        <omgdi:waypoint x="1155.0001358438572" y="135.06167341037948"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-6B313E7B-4F8C-47A7-8A3B-BFE343F700A2" id="BPMNEdge_sid-6B313E7B-4F8C-47A7-8A3B-BFE343F700A2">
+        <omgdi:waypoint x="580.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="135.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-842910A7-33C0-4DC1-B663-84C688761DA7" id="BPMNEdge_sid-842910A7-33C0-4DC1-B663-84C688761DA7">
+        <omgdi:waypoint x="75.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="135.0" y="135.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714" id="BPMNEdge_sid-AF594B24-4F5B-4169-BD67-1C3C2AFD7714">
+        <omgdi:waypoint x="415.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="480.0" y="135.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7870BC74-6767-4872-8046-F9850BF09E25" id="BPMNEdge_sid-7870BC74-6767-4872-8046-F9850BF09E25">
+        <omgdi:waypoint x="940.0" y="135.1510574018127"></omgdi:waypoint>
+        <omgdi:waypoint x="1035.439393939394" y="135.43939393939394"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-42E794AB-A831-42E1-B9C0-D719096AC5AB" id="BPMNEdge_sid-42E794AB-A831-42E1-B9C0-D719096AC5AB">
+        <omgdi:waypoint x="235.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="315.0" y="135.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-53E8341C-35AA-49D4-B9A0-274545608FE6" id="BPMNEdge_sid-53E8341C-35AA-49D4-B9A0-274545608FE6">
+        <omgdi:waypoint x="760.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="840.0" y="135.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C359B02F-5369-4CA5-B9B4-5012FE846ABC" id="BPMNEdge_sid-C359B02F-5369-4CA5-B9B4-5012FE846ABC">
+        <omgdi:waypoint x="1055.5" y="154.5"></omgdi:waypoint>
+        <omgdi:waypoint x="1055.5" y="220.0"></omgdi:waypoint>
+        <omgdi:waypoint x="710.0" y="220.0"></omgdi:waypoint>
+        <omgdi:waypoint x="710.0" y="175.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>