质量问题反馈流程修改

sop-business/src/main/java/com/qmth/sop/business/activiti/listener/ProcessEventListener.java

@@ -221,7 +221,8 @@ public class ProcessEventListener implements ActivitiEventListener, Serializable
                             if (Objects.equals(node.getName(), SystemConstant.USER_TASK) || Objects.equals(node.getName(), SystemConstant.END_EVENT)) {
                                 if (Objects.equals(attr.getName(), SystemConstant.ID)) {
                                     flowTaskResult.setTaskKey(attr.getValue());
-                                    flowTaskResult.setSetup(Integer.valueOf(attr.getValue().substring(attr.getValue().length() - 1, attr.getValue().length())));
+                                    String[] strs = attr.getValue().split("_");
+                                    flowTaskResult.setSetup(Integer.parseInt(strs[strs.length - 1]));
                                     setupMap.put(attr.getValue(), flowTaskResult);
                                 } else if (Objects.equals(attr.getName(), SystemConstant.NAME)) {
                                     flowTaskResult.setTaskName(attr.getValue());

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

@@ -12,7 +12,7 @@
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject2==1}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
-    <startEvent id="startevent1" name="Start"></startEvent>
+    <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>
@@ -58,7 +58,6 @@
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject4==1}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
-    <sequenceFlow id="flow30" sourceRef="f_usertask_cloudmark_inside_approve_3" targetRef="f_usertask_cloudmark_env_test_4"></sequenceFlow>
     <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>
@@ -70,6 +69,14 @@
     <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>
+    <exclusiveGateway id="exclusivegateway1" name="Exclusive Gateway"></exclusiveGateway>
+    <sequenceFlow id="flow37" sourceRef="f_usertask_cloudmark_inside_approve_3" targetRef="exclusivegateway1"></sequenceFlow>
+    <sequenceFlow id="flow38" name="通过" sourceRef="exclusivegateway1" targetRef="f_usertask_cloudmark_env_test_4">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_cloudmark_env_test_4'}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow39" name="驳回" sourceRef="exclusivegateway1" targetRef="f_usertask_cloudmark_information_2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_cloudmark_information_2'}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_CLOUD_MARK_SOP_FLOW">
     <bpmndi:BPMNPlane bpmnElement="CLOUD_MARK_SOP_FLOW" id="BPMNPlane_CLOUD_MARK_SOP_FLOW">
@@ -77,7 +84,7 @@
         <omgdc:Bounds height="55.0" width="85.0" x="456.0" y="20.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_end_0" id="BPMNShape_f_usertask_cloudmark_end_0">
-        <omgdc:Bounds height="35.0" width="35.0" x="641.0" y="272.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="481.0" y="270.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_information_2" id="BPMNShape_f_usertask_cloudmark_information_2">
         <omgdc:Bounds height="55.0" width="85.0" x="290.0" y="20.0"></omgdc:Bounds>
@@ -89,28 +96,31 @@
         <omgdc:Bounds height="55.0" width="85.0" x="140.0" y="20.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_device_out_5" id="BPMNShape_f_usertask_cloudmark_device_out_5">
-        <omgdc:Bounds height="55.0" width="85.0" x="616.0" y="140.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="456.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_scan_ready_6" id="BPMNShape_f_usertask_cloudmark_scan_ready_6">
-        <omgdc:Bounds height="55.0" width="85.0" x="456.0" y="140.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="299.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_check_final_7" id="BPMNShape_f_usertask_cloudmark_check_final_7">
-        <omgdc:Bounds height="55.0" width="85.0" x="285.0" y="140.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="142.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_prep_8" id="BPMNShape_f_usertask_cloudmark_mark_prep_8">
-        <omgdc:Bounds height="55.0" width="85.0" x="130.0" y="140.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="10.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_final_10" id="BPMNShape_f_usertask_cloudmark_mark_final_10">
-        <omgdc:Bounds height="55.0" width="85.0" x="290.0" y="260.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="150.0" y="260.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_device_in_11" id="BPMNShape_f_usertask_cloudmark_device_in_11">
-        <omgdc:Bounds height="55.0" width="85.0" x="456.0" y="262.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="299.0" y="260.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_env_test_4" id="BPMNShape_f_usertask_cloudmark_env_test_4">
-        <omgdc:Bounds height="55.0" width="85.0" x="616.0" y="20.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="620.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_check_9" id="BPMNShape_f_usertask_cloudmark_mark_check_9">
-        <omgdc:Bounds height="55.0" width="85.0" x="130.0" y="260.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="10.0" y="260.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="exclusivegateway1" id="BPMNShape_exclusivegateway1">
+        <omgdc:Bounds height="40.0" width="40.0" x="642.0" y="27.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
         <omgdi:waypoint x="65.0" y="47.0"></omgdi:waypoint>
@@ -121,45 +131,61 @@
         <omgdi:waypoint x="290.0" y="47.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22">
-        <omgdi:waypoint x="616.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="541.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="456.0" y="168.0"></omgdi:waypoint>
+        <omgdi:waypoint x="384.0" y="168.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow28" id="BPMNEdge_flow28">
-        <omgdi:waypoint x="541.0" y="289.0"></omgdi:waypoint>
-        <omgdi:waypoint x="641.0" y="289.0"></omgdi:waypoint>
+        <omgdi:waypoint x="384.0" y="287.0"></omgdi:waypoint>
+        <omgdi:waypoint x="481.0" y="287.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow29" id="BPMNEdge_flow29">
-        <omgdi:waypoint x="375.0" y="287.0"></omgdi:waypoint>
-        <omgdi:waypoint x="456.0" y="289.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow30" id="BPMNEdge_flow30">
-        <omgdi:waypoint x="541.0" y="47.0"></omgdi:waypoint>
-        <omgdi:waypoint x="616.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="235.0" y="287.0"></omgdi:waypoint>
+        <omgdi:waypoint x="299.0" y="287.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow31" id="BPMNEdge_flow31">
-        <omgdi:waypoint x="658.0" y="75.0"></omgdi:waypoint>
-        <omgdi:waypoint x="658.0" y="140.0"></omgdi:waypoint>
+        <omgdi:waypoint x="620.0" y="168.0"></omgdi:waypoint>
+        <omgdi:waypoint x="541.0" y="168.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow32" id="BPMNEdge_flow32">
-        <omgdi:waypoint x="456.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="370.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="299.0" y="168.0"></omgdi:waypoint>
+        <omgdi:waypoint x="227.0" y="168.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow33" id="BPMNEdge_flow33">
-        <omgdi:waypoint x="285.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="215.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="142.0" y="168.0"></omgdi:waypoint>
+        <omgdi:waypoint x="95.0" y="168.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow34" id="BPMNEdge_flow34">
-        <omgdi:waypoint x="172.0" y="195.0"></omgdi:waypoint>
-        <omgdi:waypoint x="172.0" y="260.0"></omgdi:waypoint>
+        <omgdi:waypoint x="52.0" y="196.0"></omgdi:waypoint>
+        <omgdi:waypoint x="52.0" y="260.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow35" id="BPMNEdge_flow35">
-        <omgdi:waypoint x="215.0" y="287.0"></omgdi:waypoint>
-        <omgdi:waypoint x="290.0" y="287.0"></omgdi:waypoint>
+        <omgdi:waypoint x="95.0" y="287.0"></omgdi:waypoint>
+        <omgdi:waypoint x="150.0" y="287.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow36" id="BPMNEdge_flow36">
         <omgdi:waypoint x="375.0" y="47.0"></omgdi:waypoint>
         <omgdi:waypoint x="456.0" y="47.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow37" id="BPMNEdge_flow37">
+        <omgdi:waypoint x="541.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="642.0" y="47.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow38" id="BPMNEdge_flow38">
+        <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>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow39" id="BPMNEdge_flow39">
+        <omgdi:waypoint x="662.0" y="67.0"></omgdi:waypoint>
+        <omgdi:waypoint x="506.0" y="118.0"></omgdi:waypoint>
+        <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>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>

sop-server/src/main/resources/cloudmark_sop_start.form

@@ -0,0 +1 @@
+{"approveRejectMap":{"f_usertask_cloudmark_inside_approve_3":[{"afterFlowTaskKey":"f_usertask_cloudmark_information_2","setup":2}]}}

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

@@ -12,7 +12,7 @@
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject2==1}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
-    <startEvent id="startevent1" name="Start"></startEvent>
+    <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>
@@ -26,7 +26,6 @@
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject4==1}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
-    <sequenceFlow id="flow21" sourceRef="f_usertask_office_inside_approve_3" targetRef="f_usertask_office_device_out_4"></sequenceFlow>
     <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>
@@ -64,6 +63,14 @@
     </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>
+    <sequenceFlow id="flow30" sourceRef="f_usertask_office_inside_approve_3" targetRef="exclusivegateway1"></sequenceFlow>
+    <sequenceFlow id="flow31" name="通过" sourceRef="exclusivegateway1" targetRef="f_usertask_office_device_out_4">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_office_device_out_4'}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow32" name="驳回" sourceRef="exclusivegateway1" targetRef="f_usertask_office_information_2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_office_information_2'}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_OFFICE_SOP_FLOW">
     <bpmndi:BPMNPlane bpmnElement="OFFICE_SOP_FLOW" id="BPMNPlane_OFFICE_SOP_FLOW">
@@ -71,7 +78,7 @@
         <omgdc:Bounds height="55.0" width="85.0" x="470.0" y="20.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_end_0" id="BPMNShape_f_usertask_office_end_0">
-        <omgdc:Bounds height="35.0" width="35.0" x="497.0" y="270.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="325.0" y="270.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_information_2" id="BPMNShape_f_usertask_office_information_2">
         <omgdc:Bounds height="55.0" width="85.0" x="290.0" y="20.0"></omgdc:Bounds>
@@ -83,25 +90,28 @@
         <omgdc:Bounds height="55.0" width="85.0" x="140.0" y="20.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_device_out_4" id="BPMNShape_f_usertask_office_device_out_4">
-        <omgdc:Bounds height="55.0" width="85.0" x="640.0" y="20.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="638.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_scan_ready_5" id="BPMNShape_f_usertask_office_scan_ready_5">
-        <omgdc:Bounds height="55.0" width="85.0" x="640.0" y="140.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="460.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_scan_6" id="BPMNShape_f_usertask_office_scan_6">
-        <omgdc:Bounds height="55.0" width="85.0" x="472.0" y="140.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="300.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_check_final_7" id="BPMNShape_f_usertask_office_check_final_7">
-        <omgdc:Bounds height="55.0" width="85.0" x="290.0" y="140.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="150.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_mark_prep_8" id="BPMNShape_f_usertask_office_mark_prep_8">
-        <omgdc:Bounds height="55.0" width="85.0" x="140.0" y="140.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="24.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_mark_final_9" id="BPMNShape_f_usertask_office_mark_final_9">
-        <omgdc:Bounds height="55.0" width="85.0" x="140.0" y="260.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="24.0" y="260.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_device_in_10" id="BPMNShape_f_usertask_office_device_in_10">
-        <omgdc:Bounds height="55.0" width="85.0" x="300.0" y="260.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="160.0" y="260.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="exclusivegateway1" id="BPMNShape_exclusivegateway1">
+        <omgdc:Bounds height="40.0" width="40.0" x="660.0" y="27.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
         <omgdi:waypoint x="65.0" y="47.0"></omgdi:waypoint>
@@ -115,37 +125,53 @@
         <omgdi:waypoint x="375.0" y="47.0"></omgdi:waypoint>
         <omgdi:waypoint x="470.0" y="47.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow21" id="BPMNEdge_flow21">
-        <omgdi:waypoint x="555.0" y="47.0"></omgdi:waypoint>
-        <omgdi:waypoint x="640.0" y="47.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22">
-        <omgdi:waypoint x="682.0" y="75.0"></omgdi:waypoint>
-        <omgdi:waypoint x="682.0" y="140.0"></omgdi:waypoint>
+        <omgdi:waypoint x="638.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="545.0" y="167.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow23" id="BPMNEdge_flow23">
-        <omgdi:waypoint x="640.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="557.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="460.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="385.0" y="167.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow24" id="BPMNEdge_flow24">
-        <omgdi:waypoint x="472.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="375.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="300.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="235.0" y="167.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow25" id="BPMNEdge_flow25">
-        <omgdi:waypoint x="290.0" y="167.0"></omgdi:waypoint>
-        <omgdi:waypoint x="225.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="150.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="109.0" y="167.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow26" id="BPMNEdge_flow26">
-        <omgdi:waypoint x="182.0" y="195.0"></omgdi:waypoint>
-        <omgdi:waypoint x="182.0" y="260.0"></omgdi:waypoint>
+        <omgdi:waypoint x="66.0" y="195.0"></omgdi:waypoint>
+        <omgdi:waypoint x="66.0" y="260.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow28" id="BPMNEdge_flow28">
-        <omgdi:waypoint x="385.0" y="287.0"></omgdi:waypoint>
-        <omgdi:waypoint x="497.0" y="287.0"></omgdi:waypoint>
+        <omgdi:waypoint x="245.0" y="287.0"></omgdi:waypoint>
+        <omgdi:waypoint x="325.0" y="287.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow29" id="BPMNEdge_flow29">
-        <omgdi:waypoint x="225.0" y="287.0"></omgdi:waypoint>
-        <omgdi:waypoint x="300.0" y="287.0"></omgdi:waypoint>
+        <omgdi:waypoint x="109.0" y="287.0"></omgdi:waypoint>
+        <omgdi:waypoint x="160.0" y="287.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow30" id="BPMNEdge_flow30">
+        <omgdi:waypoint x="555.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="47.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow31" id="BPMNEdge_flow31">
+        <omgdi:waypoint x="680.0" y="67.0"></omgdi:waypoint>
+        <omgdi:waypoint x="680.0" y="140.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="16.0" width="22.0" x="680.0" y="67.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow32" id="BPMNEdge_flow32">
+        <omgdi:waypoint x="680.0" y="67.0"></omgdi:waypoint>
+        <omgdi:waypoint x="517.0" y="120.0"></omgdi:waypoint>
+        <omgdi:waypoint x="332.0" y="120.0"></omgdi:waypoint>
+        <omgdi:waypoint x="332.0" y="75.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="16.0" width="22.0" x="680.0" y="67.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

sop-server/src/main/resources/office_sop_start.form

@@ -0,0 +1 @@
+{"approveRejectMap":{"f_usertask_office_inside_approve_3":[{"afterFlowTaskKey":"f_usertask_office_information_2","setup":2}]}}