流程修改

sop-server/src/main/resources/cloudMarkSopFlow.bpmn

@@ -1,71 +1,27 @@
 <?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" xmlns:tns="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test" id="m1626068475250" name="">
   <process id="CLOUD_MARK_SOP_FLOW" isExecutable="true" isClosed="false" processType="None">
-    <userTask id="f_usertask_cloudmark_inside_approve_3" name="项目内审" activiti:assignee="${assignee3}" activiti:formKey="cloudmark_sop_inside_approve.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList3}" activiti:elementVariable="assignee3">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject3==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_cloudmark_inside_approve_3" name="项目内审" activiti:candidateUsers="${assigneeList3}" activiti:formKey="cloudmark_sop_inside_approve.form"></userTask>
     <endEvent id="f_usertask_cloudmark_end_0" name="结束"></endEvent>
-    <userTask id="f_usertask_cloudmark_information_2" name="项目关键信息" activiti:assignee="${assignee2}" activiti:formKey="cloudmark_sop_information.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList2}" activiti:elementVariable="assignee2">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject2==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_cloudmark_information_2" name="项目关键信息" activiti:candidateUsers="${assigneeList2}" activiti:formKey="cloudmark_sop_information.form"></userTask>
     <startEvent id="startevent1" name="Start" activiti:formKey="cloudmark_sop_start.form"></startEvent>
-    <userTask id="f_usertask_cloudmark_first_1" name="项目初审" activiti:assignee="${assignee1}" activiti:formKey="cloudmark_sop_first.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList1}" activiti:elementVariable="assignee1">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject1==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_cloudmark_first_1" name="项目初审" activiti:candidateUsers="${assigneeList1}" activiti:formKey="cloudmark_sop_first.form"></userTask>
     <sequenceFlow id="flow6" sourceRef="startevent1" targetRef="f_usertask_cloudmark_first_1"></sequenceFlow>
     <sequenceFlow id="flow14" sourceRef="f_usertask_cloudmark_first_1" targetRef="f_usertask_cloudmark_information_2"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_device_out_5" name="设备出库登记" activiti:assignee="${assignee5}" activiti:formKey="cloudmark_sop_device_out.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList5}" activiti:elementVariable="assignee5">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject5==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <userTask id="f_usertask_cloudmark_scan_ready_6" name="扫描准备" activiti:assignee="${assignee6}" activiti:formKey="cloudmark_sop_scan_ready.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList6}" activiti:elementVariable="assignee6">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject6==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_cloudmark_device_out_5" name="设备出库登记" activiti:candidateUsers="${assigneeList5}" activiti:formKey="cloudmark_sop_device_out.form"></userTask>
+    <userTask id="f_usertask_cloudmark_scan_ready_6" name="扫描准备" activiti:candidateUsers="${assigneeList6}" activiti:formKey="cloudmark_sop_scan_ready.form"></userTask>
     <sequenceFlow id="flow22" sourceRef="f_usertask_cloudmark_device_out_5" targetRef="f_usertask_cloudmark_scan_ready_6"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_check_final_7" name="校验收尾" activiti:assignee="${assignee7}" activiti:formKey="cloudmark_sop_check_final.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList7}" activiti:elementVariable="assignee7">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject7==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <userTask id="f_usertask_cloudmark_mark_prep_8" name="评卷准备" activiti:assignee="${assignee8}" activiti:formKey="cloudmark_sop_mark_prep.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList8}" activiti:elementVariable="assignee8">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject8==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <userTask id="f_usertask_cloudmark_mark_final_10" name="评卷收尾" activiti:assignee="${assignee10}" activiti:formKey="cloudmark_sop_mark_final.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList10}" activiti:elementVariable="assignee10">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject10==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <userTask id="f_usertask_cloudmark_device_in_11" name="设备入库登记" activiti:assignee="${assignee11}" activiti:formKey="cloudmark_sop_device_in.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList11}" activiti:elementVariable="assignee11">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject11==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_cloudmark_check_final_7" name="校验收尾" activiti:candidateUsers="${assigneeList7}" activiti:formKey="cloudmark_sop_check_final.form"></userTask>
+    <userTask id="f_usertask_cloudmark_mark_prep_8" name="评卷准备" activiti:candidateUsers="${assigneeList8}" activiti:formKey="cloudmark_sop_mark_prep.form"></userTask>
+    <userTask id="f_usertask_cloudmark_mark_final_10" name="评卷收尾" activiti:candidateUsers="${assigneeList10}" activiti:formKey="cloudmark_sop_mark_final.form"></userTask>
+    <userTask id="f_usertask_cloudmark_device_in_11" name="设备入库登记" activiti:candidateUsers="${assigneeList11}" activiti:formKey="cloudmark_sop_device_in.form"></userTask>
     <sequenceFlow id="flow28" sourceRef="f_usertask_cloudmark_device_in_11" targetRef="f_usertask_cloudmark_end_0"></sequenceFlow>
     <sequenceFlow id="flow29" sourceRef="f_usertask_cloudmark_mark_final_10" targetRef="f_usertask_cloudmark_device_in_11"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_env_test_4" name="现场环境测试" activiti:assignee="${assignee4}" activiti:formKey="cloudmark_sop_env_test.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList4}" activiti:elementVariable="assignee4">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject4==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_cloudmark_env_test_4" name="现场环境测试" activiti:candidateUsers="${assigneeList4}" activiti:formKey="cloudmark_sop_env_test.form"></userTask>
     <sequenceFlow id="flow31" sourceRef="f_usertask_cloudmark_env_test_4" targetRef="f_usertask_cloudmark_device_out_5"></sequenceFlow>
     <sequenceFlow id="flow32" sourceRef="f_usertask_cloudmark_scan_ready_6" targetRef="f_usertask_cloudmark_check_final_7"></sequenceFlow>
     <sequenceFlow id="flow33" sourceRef="f_usertask_cloudmark_check_final_7" targetRef="f_usertask_cloudmark_mark_prep_8"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_mark_check_9" name="成绩复核" activiti:assignee="${assignee9}" activiti:formKey="cloudmark_sop_mark_check.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList9}" activiti:elementVariable="assignee9">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject9==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_cloudmark_mark_check_9" name="成绩复核" activiti:candidateUsers="${assigneeList9}" activiti:formKey="cloudmark_sop_mark_check.form"></userTask>
     <sequenceFlow id="flow34" sourceRef="f_usertask_cloudmark_mark_prep_8" targetRef="f_usertask_cloudmark_mark_check_9"></sequenceFlow>
     <sequenceFlow id="flow35" sourceRef="f_usertask_cloudmark_mark_check_9" targetRef="f_usertask_cloudmark_mark_final_10"></sequenceFlow>
     <sequenceFlow id="flow36" sourceRef="f_usertask_cloudmark_information_2" targetRef="f_usertask_cloudmark_inside_approve_3"></sequenceFlow>
@@ -174,7 +130,7 @@
         <omgdi:waypoint x="662.0" y="67.0"></omgdi:waypoint>
         <omgdi:waypoint x="662.0" y="141.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="662.0" y="67.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="22.0" x="662.0" y="67.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow39" id="BPMNEdge_flow39">
@@ -183,7 +139,7 @@
         <omgdi:waypoint x="332.0" y="118.0"></omgdi:waypoint>
         <omgdi:waypoint x="332.0" y="75.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="662.0" y="67.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="22.0" x="662.0" y="67.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>

sop-server/src/main/resources/officeSopFlow.bpmn

@@ -1,66 +1,26 @@
 <?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" xmlns:tns="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test" id="m1626068475250" name="">
   <process id="OFFICE_SOP_FLOW" isExecutable="true" isClosed="false" processType="None">
-    <userTask id="f_usertask_office_inside_approve_3" name="项目内审" activiti:assignee="${assignee3}" activiti:formKey="office_sop_inside_approve.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList3}" activiti:elementVariable="assignee3">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject3==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_inside_approve_3" name="项目内审" activiti:candidateUsers="${assigneeList3}" activiti:formKey="office_sop_inside_approve.form"></userTask>
     <endEvent id="f_usertask_office_end_0" name="结束"></endEvent>
-    <userTask id="f_usertask_office_information_2" name="项目关键信息" activiti:assignee="${assignee2}" activiti:formKey="office_sop_information.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList2}" activiti:elementVariable="assignee2">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject2==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_information_2" name="项目关键信息" activiti:candidateUsers="${assigneeList2}" activiti:formKey="office_sop_information.form"></userTask>
     <startEvent id="startevent1" name="Start" activiti:formKey="office_sop_start.form"></startEvent>
-    <userTask id="f_usertask_office_first_1" name="项目初审" activiti:assignee="${assignee1}" activiti:formKey="office_sop_first.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList1}" activiti:elementVariable="assignee1">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject1==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_first_1" name="项目初审" activiti:candidateUsers="${assigneeList1}" activiti:formKey="office_sop_first.form"></userTask>
     <sequenceFlow id="flow6" sourceRef="startevent1" targetRef="f_usertask_office_first_1"></sequenceFlow>
     <sequenceFlow id="flow14" sourceRef="f_usertask_office_first_1" targetRef="f_usertask_office_information_2"></sequenceFlow>
     <sequenceFlow id="flow20" sourceRef="f_usertask_office_information_2" targetRef="f_usertask_office_inside_approve_3"></sequenceFlow>
-    <userTask id="f_usertask_office_device_out_4" name="设备出库登记" activiti:assignee="${assignee4}" activiti:formKey="office_sop_device_out.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList4}" activiti:elementVariable="assignee4">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject4==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <userTask id="f_usertask_office_scan_ready_5" name="扫描准备" activiti:assignee="${assignee5}" activiti:formKey="office_sop_scan_ready.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList5}" activiti:elementVariable="assignee5">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject5==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_device_out_4" name="设备出库登记" activiti:candidateUsers="${assigneeList4}" activiti:formKey="office_sop_device_out.form"></userTask>
+    <userTask id="f_usertask_office_scan_ready_5" name="扫描准备" activiti:candidateUsers="${assigneeList5}" activiti:formKey="office_sop_scan_ready.form"></userTask>
     <sequenceFlow id="flow22" sourceRef="f_usertask_office_device_out_4" targetRef="f_usertask_office_scan_ready_5"></sequenceFlow>
-    <userTask id="f_usertask_office_scan_6" name="正式扫描" activiti:assignee="${assignee6}" activiti:formKey="office_sop_scan.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList6}" activiti:elementVariable="assignee6">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject6==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_scan_6" name="正式扫描" activiti:candidateUsers="${assigneeList6}" activiti:formKey="office_sop_scan.form"></userTask>
     <sequenceFlow id="flow23" sourceRef="f_usertask_office_scan_ready_5" targetRef="f_usertask_office_scan_6"></sequenceFlow>
-    <userTask id="f_usertask_office_check_final_7" name="校验收尾" activiti:assignee="${assignee7}" activiti:formKey="office_sop_check_final.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList7}" activiti:elementVariable="assignee7">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject7==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_check_final_7" name="校验收尾" activiti:candidateUsers="${assigneeList7}" activiti:formKey="office_sop_check_final.form"></userTask>
     <sequenceFlow id="flow24" sourceRef="f_usertask_office_scan_6" targetRef="f_usertask_office_check_final_7"></sequenceFlow>
-    <userTask id="f_usertask_office_mark_prep_8" name="评卷准备" activiti:assignee="${assignee8}" activiti:formKey="office_sop_mark_prep.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList8}" activiti:elementVariable="assignee8">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject8==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_mark_prep_8" name="评卷准备" activiti:candidateUsers="${assigneeList8}" activiti:formKey="office_sop_mark_prep.form"></userTask>
     <sequenceFlow id="flow25" sourceRef="f_usertask_office_check_final_7" targetRef="f_usertask_office_mark_prep_8"></sequenceFlow>
-    <userTask id="f_usertask_office_mark_final_9" name="评卷收尾" activiti:assignee="${assignee9}" activiti:formKey="office_sop_mark_final.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList9}" activiti:elementVariable="assignee9">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject9==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_mark_final_9" name="评卷收尾" activiti:candidateUsers="${assigneeList9}" activiti:formKey="office_sop_mark_final.form"></userTask>
     <sequenceFlow id="flow26" sourceRef="f_usertask_office_mark_prep_8" targetRef="f_usertask_office_mark_final_9"></sequenceFlow>
-    <userTask id="f_usertask_office_device_in_10" name="设备入库登记" activiti:assignee="${assignee10}" activiti:formKey="office_sop_device_in.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList10}" activiti:elementVariable="assignee10">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject10==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
+    <userTask id="f_usertask_office_device_in_10" name="设备入库登记" activiti:candidateUsers="${assigneeList10}" activiti:formKey="office_sop_device_in.form"></userTask>
     <sequenceFlow id="flow28" sourceRef="f_usertask_office_device_in_10" targetRef="f_usertask_office_end_0"></sequenceFlow>
     <sequenceFlow id="flow29" sourceRef="f_usertask_office_mark_final_9" targetRef="f_usertask_office_device_in_10"></sequenceFlow>
     <exclusiveGateway id="exclusivegateway1" name="Exclusive Gateway"></exclusiveGateway>