新增教务处sop和研究生sop流程

sop-business/src/main/java/com/qmth/sop/business/bean/params/ServiceUnitParam.java

@@ -23,7 +23,7 @@ public class ServiceUnitParam {
     @NotNull(message = "请提供服务单元名称")
     private String name;
 
-    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：研究生")
     @NotNull(message = "请提供服务单元类型")
     private ProductTypeEnum type;
 

sop-business/src/main/java/com/qmth/sop/business/bean/result/ServiceUnitResult.java

@@ -25,7 +25,7 @@ public class ServiceUnitResult {
     @ApiModelProperty(value = "结束时间")
     private Long endTime;
 
-    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：研究生")
     private ProductTypeEnum type;
 
     @ApiModelProperty(value = "服务单元负责人id")

sop-business/src/main/java/com/qmth/sop/business/bean/result/WorkTaskResult.java

@@ -94,7 +94,7 @@ public class WorkTaskResult implements Serializable {
     @ApiModelProperty(value = "服务单元名称")
     private String serviceName;
 
-    @ApiModelProperty(value = "服务单元类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "服务单元类型，OFFICE：教务处，CLOUD_MARK：研究生")
     private ProductTypeEnum serviceType;
 
     @ApiModelProperty(value = "服务单元类型str")

sop-business/src/main/java/com/qmth/sop/business/bean/result/WorkWarnResult.java

@@ -43,7 +43,7 @@ public class WorkWarnResult implements Serializable {
     @ApiModelProperty(value = "服务单元名称")
     private String serviceName;
 
-    @ApiModelProperty(value = "服务单元类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "服务单元类型，OFFICE：教务处，CLOUD_MARK：研究生")
     private ProductTypeEnum serviceType;
 
     @ApiModelProperty(value = "服务单元类型str")

sop-business/src/main/java/com/qmth/sop/business/entity/SysCustom.java

@@ -31,7 +31,7 @@ public class SysCustom extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "编码")
     private String code;
 
-    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：研究生")
     private ProductTypeEnum type;
 
     @ApiModelProperty(value = "省份")

sop-business/src/main/java/com/qmth/sop/business/entity/SysLevel.java

@@ -31,7 +31,7 @@ public class SysLevel implements Serializable {
     @NotBlank(message = "档位不能为空")
     private String level;
 
-    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：研究生")
     @NotNull(message = "s类型不能为空")
     private ProductTypeEnum type;
 

sop-business/src/main/java/com/qmth/sop/business/entity/SysMessage.java

@@ -32,7 +32,7 @@ public class SysMessage implements Serializable {
     @ApiModelProperty(value = "编号")
     private String code;
 
-    @ApiModelProperty(value = "消息类型，BEFORE：提前提醒，AFTER：延期提醒，OFFICE_SOP：教务处SOP，CLOUD_MARK_SOP：云阅卷SOP，QUALITY：质量问题提醒，EXCEPTION_APPROVE：异常审核提醒，VIOLATION：违规提醒，SYSTEM_PLAN_CHANGE：系统计划变更提醒，SYSTEM：系统公告")
+    @ApiModelProperty(value = "消息类型，BEFORE：提前提醒，AFTER：延期提醒，OFFICE_SOP：教务处SOP，CLOUD_MARK_SOP：研究生SOP，QUALITY：质量问题提醒，EXCEPTION_APPROVE：异常审核提醒，VIOLATION：违规提醒，SYSTEM_PLAN_CHANGE：系统计划变更提醒，SYSTEM：系统公告")
     private MessageTypeEnum type;
 
     @ApiModelProperty(value = "实体业务类型")

sop-business/src/main/java/com/qmth/sop/business/entity/TBProduct.java

@@ -28,7 +28,7 @@ public class TBProduct implements Serializable {
     @ApiModelProperty(value = "名称")
     private String name;
 
-    @ApiModelProperty(value = "编码，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "编码，OFFICE：教务处，CLOUD_MARK：研究生")
     private ProductTypeEnum code;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")

sop-business/src/main/java/com/qmth/sop/business/entity/TBProjectExchange.java

@@ -1,6 +1,7 @@
 package com.qmth.sop.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.contant.SystemConstant;
@@ -23,6 +24,7 @@ import java.util.List;
  * @since 2023-08-01
  */
 @ApiModel(value = "TBProjectExchange对象", description = "项目变更计划表")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TBProjectExchange implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -47,7 +49,7 @@ public class TBProjectExchange implements Serializable {
     @NotNull(message = "服务单元id不能为空")
     private Long serviceId;
 
-    @ApiModelProperty(value = "变更类型，PLAN：项目信息及计划，TIME：处理时限，CANCEL：项目取消")
+    @ApiModelProperty(value = "变更类型，PLAN：项目信息及计划，CANCEL：项目取消")
     @NotNull(message = "变更类型不能为空")
     private DelayWarnTypeEnum type;
 

sop-business/src/main/java/com/qmth/sop/business/entity/TBService.java

@@ -26,7 +26,7 @@ public class TBService extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "名称")
     private String name;
 
-    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：研究生")
     private ProductTypeEnum type;
 
     @ApiModelProperty(value = "开始时间")

sop-business/src/main/java/com/qmth/sop/business/entity/TBSopInfo.java

@@ -54,7 +54,7 @@ public class TBSopInfo extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long cloudMarkUserId;
 
-    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
+    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：研究生")
     private ProductTypeEnum type;
 
     @ApiModelProperty(value = "提交人id")

sop-business/src/main/java/com/qmth/sop/business/entity/TFCustomFlow.java

@@ -39,7 +39,7 @@ public class TFCustomFlow extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "模式类型")
     private TFCustomModelTypeEnum modelType;
 
-    @ApiModelProperty(value = "流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：云阅卷SOP，DING_EXCEPTION_FLOW：考勤异常审核流程，PROJECT_EXCHANGE_FLOW：项目计划变更流程，QUALITY_PROBLEM_FLOW：质量问题反馈流程")
+    @ApiModelProperty(value = "流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP，DING_EXCEPTION_FLOW：考勤异常审核流程，PROJECT_EXCHANGE_FLOW：项目计划变更流程，QUALITY_PROBLEM_FLOW：质量问题反馈流程")
     private TFCustomTypeEnum type;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -825,4 +825,22 @@ ALTER TABLE t_b_project_exchange ADD result VARCHAR(20)
     COMMENT '处理结果，FINISH：已完成，NOT_UPDATE：经沟通，取消变更，PARTIAL_UPDATE：经沟通，部分变更' NULL after content_json;
 
 ALTER TABLE t_b_project_exchange ADD remark VARCHAR(500)
-    COMMENT '变更备注' NULL after result;
+    COMMENT '变更备注' NULL after result;
+
+--2023.8.26update
+ALTER TABLE sys_custom CHANGE COLUMN type type VARCHAR(20)
+    COMMENT '类型，OFFICE：教务处，CLOUD_MARK：研究生' NULL;
+ALTER TABLE sys_level CHANGE COLUMN type type VARCHAR(20)
+    COMMENT '类型，OFFICE：教务处，CLOUD_MARK：研究生' NOT NULL;
+ALTER TABLE sys_message CHANGE COLUMN type type VARCHAR(20)
+    COMMENT '消息类型，BEFORE：提前提醒，AFTER：延期提醒，OFFICE_SOP：教务处SOP，CLOUD_MARK_SOP：研究生SOP，QUALITY：质量问题提醒，EXCEPTION_APPROVE：异常审核提醒，VIOLATION：违规提醒，SYSTEM_PLAN_CHANGE：系统计划变更提醒，SYSTEM：系统公告' NOT NULL;
+ALTER TABLE t_b_product CHANGE COLUMN code code VARCHAR(100)
+    COMMENT '编码，OFFICE：教务处，CLOUD_MARK：研究生' NOT NULL;
+ALTER TABLE t_b_project_exchange CHANGE COLUMN type type VARCHAR(20)
+    COMMENT '变更类型，PLAN：项目信息及计划，CANCEL：项目取消' NOT NULL;
+ALTER TABLE t_b_service CHANGE COLUMN type type VARCHAR(20)
+    COMMENT '类型，OFFICE：教务处，CLOUD_MARK：研究生' NOT NULL;
+ALTER TABLE t_b_sop_info CHANGE COLUMN type type VARCHAR(20)
+    COMMENT '类型，OFFICE：教务处，CLOUD_MARK：研究生' NOT NULL;
+ALTER TABLE t_f_custom_flow CHANGE COLUMN type type VARCHAR(100)
+    COMMENT '流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP，DING_EXCEPTION_FLOW：考勤异常审核流程，PROJECT_EXCHANGE_FLOW：项目计划变更流程，QUALITY_PROBLEM_FLOW：质量问题反馈流程' NOT NULL;

sop-common/src/main/java/com/qmth/sop/common/enums/MessageTypeEnum.java

@@ -15,7 +15,7 @@ public enum MessageTypeEnum {
 
     OFFICE_SOP("教务处SOP"),
 
-    CLOUD_MARK_SOP("云阅卷SOP"),
+    CLOUD_MARK_SOP("研究生SOP"),
 
     QUALITY("质量问题提醒"),
 

sop-common/src/main/java/com/qmth/sop/common/enums/ProductTypeEnum.java

@@ -11,7 +11,7 @@ public enum ProductTypeEnum {
 
     OFFICE("教务处"),
 
-    CLOUD_MARK("云阅卷");
+    CLOUD_MARK("研究生");
 
     private String title;
 

sop-common/src/main/java/com/qmth/sop/common/enums/TFCustomTypeEnum.java

@@ -9,9 +9,9 @@ package com.qmth.sop.common.enums;
  */
 public enum TFCustomTypeEnum {
 
-    OFFICE_SOP_FLOW("教务处SOP", "officeSopFlow", "testform1.zip","SOP_O"),
+    OFFICE_SOP_FLOW("教务处SOP", "officeSopFlow", "officeSopFlow.zip","SOP_O"),
 
-    CLOUD_MARK_SOP_FLOW("云阅卷SOP", "cloudMarkSopFlow", null,"SOP_C"),
+    CLOUD_MARK_SOP_FLOW("研究生SOP", "cloudMarkSopFlow", "cloudMarkSopFlow.zip","SOP_C"),
 
     DING_EXCEPTION_FLOW("考勤异常审核流程", "dingExceptionFlow", "dingExceptionFlow.zip","DE"),
 

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

@@ -0,0 +1,165 @@
+<?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>
+    <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>
+    <startEvent id="startevent1" name="Start"></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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_CLOUD_MARK_SOP_FLOW">
+    <bpmndi:BPMNPlane bpmnElement="CLOUD_MARK_SOP_FLOW" id="BPMNPlane_CLOUD_MARK_SOP_FLOW">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_inside_approve_3" id="BPMNShape_f_usertask_cloudmark_inside_approve_3">
+        <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>
+      </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>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="30.0" y="30.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_first_1" id="BPMNShape_f_usertask_cloudmark_first_1">
+        <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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
+        <omgdi:waypoint x="65.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="140.0" y="47.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14">
+        <omgdi:waypoint x="225.0" y="47.0"></omgdi:waypoint>
+        <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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

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

@@ -1,48 +0,0 @@
-<?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="DING_EXCEPTION_FLOW" isExecutable="true" isClosed="false" processType="None">
-    <endEvent id="f_usertask_ding_exception_end_0" name="结束"></endEvent>
-    <userTask id="f_usertask_ding_exception_approve_2" name="异常处理审核" activiti:assignee="${assignee2}">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList2}" activiti:elementVariable="assignee2">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject2==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <startEvent id="startevent1" name="Start"></startEvent>
-    <userTask id="f_usertask_ding_exception_apply_1" name="异常处理申请" activiti:assignee="${assignee1}">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList1}" activiti:elementVariable="assignee1">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject1==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <sequenceFlow id="flow6" sourceRef="startevent1" targetRef="f_usertask_ding_exception_apply_1"></sequenceFlow>
-    <sequenceFlow id="flow14" sourceRef="f_usertask_ding_exception_apply_1" targetRef="f_usertask_ding_exception_approve_2"></sequenceFlow>
-    <sequenceFlow id="flow18" sourceRef="f_usertask_ding_exception_approve_2" targetRef="f_usertask_ding_exception_end_0"></sequenceFlow>
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_DING_EXCEPTION_FLOW">
-    <bpmndi:BPMNPlane bpmnElement="DING_EXCEPTION_FLOW" id="BPMNPlane_DING_EXCEPTION_FLOW">
-      <bpmndi:BPMNShape bpmnElement="f_usertask_ding_exception_end_0" id="BPMNShape_f_usertask_ding_exception_end_0">
-        <omgdc:Bounds height="35.0" width="35.0" x="240.0" y="370.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_ding_exception_approve_2" id="BPMNShape_f_usertask_ding_exception_approve_2">
-        <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="240.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
-        <omgdc:Bounds height="35.0" width="35.0" x="240.0" y="40.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_ding_exception_apply_1" id="BPMNShape_f_usertask_ding_exception_apply_1">
-        <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="130.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
-        <omgdi:waypoint x="257.0" y="75.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="130.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14">
-        <omgdi:waypoint x="257.0" y="185.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="240.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow18" id="BPMNEdge_flow18">
-        <omgdi:waypoint x="257.0" y="295.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="370.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

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

@@ -0,0 +1,152 @@
+<?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>
+    <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>
+    <startEvent id="startevent1" name="Start"></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>
+    <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>
+    <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>
+      </multiInstanceLoopCharacteristics>
+    </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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_OFFICE_SOP_FLOW">
+    <bpmndi:BPMNPlane bpmnElement="OFFICE_SOP_FLOW" id="BPMNPlane_OFFICE_SOP_FLOW">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_office_inside_approve_3" id="BPMNShape_f_usertask_office_inside_approve_3">
+        <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>
+      </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>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="30.0" y="30.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="f_usertask_office_first_1" id="BPMNShape_f_usertask_office_first_1">
+        <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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
+        <omgdi:waypoint x="65.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="140.0" y="47.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14">
+        <omgdi:waypoint x="225.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="290.0" y="47.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow20" id="BPMNEdge_flow20">
+        <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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </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>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

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

@@ -1,48 +0,0 @@
-<?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="PROJECT_EXCHANGE_FLOW" isExecutable="true" isClosed="false" processType="None">
-    <endEvent id="f_usertask_project_exchange_end_0" name="结束"></endEvent>
-    <userTask id="f_usertask_project_exchange_approve_2" name="项目计划变更审核" activiti:assignee="${assignee2}">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList2}" activiti:elementVariable="assignee2">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject2==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <startEvent id="startevent1" name="Start"></startEvent>
-    <userTask id="f_usertask_project_exchange_apply_1" name="项目计划变更申请" activiti:assignee="${assignee1}">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList1}" activiti:elementVariable="assignee1">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject1==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <sequenceFlow id="flow6" sourceRef="startevent1" targetRef="f_usertask_project_exchange_apply_1"></sequenceFlow>
-    <sequenceFlow id="flow14" sourceRef="f_usertask_project_exchange_apply_1" targetRef="f_usertask_project_exchange_approve_2"></sequenceFlow>
-    <sequenceFlow id="flow18" sourceRef="f_usertask_project_exchange_approve_2" targetRef="f_usertask_project_exchange_end_0"></sequenceFlow>
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_PROJECT_EXCHANGE_FLOW">
-    <bpmndi:BPMNPlane bpmnElement="PROJECT_EXCHANGE_FLOW" id="BPMNPlane_PROJECT_EXCHANGE_FLOW">
-      <bpmndi:BPMNShape bpmnElement="f_usertask_project_exchange_end_0" id="BPMNShape_f_usertask_project_exchange_end_0">
-        <omgdc:Bounds height="35.0" width="35.0" x="240.0" y="360.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_project_exchange_approve_2" id="BPMNShape_f_usertask_project_exchange_approve_2">
-        <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="240.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
-        <omgdc:Bounds height="35.0" width="35.0" x="240.0" y="40.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_project_exchange_apply_1" id="BPMNShape_f_usertask_project_exchange_apply_1">
-        <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="130.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
-        <omgdi:waypoint x="257.0" y="75.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="130.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14">
-        <omgdi:waypoint x="257.0" y="185.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="240.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow18" id="BPMNEdge_flow18">
-        <omgdi:waypoint x="257.0" y="295.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="360.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

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

@@ -1,138 +0,0 @@
-<?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="QUALITY_PROBLEM_FLOW" isExecutable="true" isClosed="false" processType="None">
-    <userTask id="f_usertask_quality_problem_approve_2" name="项目计划变更审核" activiti:candidateUsers="${assigneeList2}" activiti:formKey="quality_problem_approve.form"></userTask>
-    <startEvent id="startevent1" name="Start" activiti:formKey="quality_problem_start.form"></startEvent>
-    <userTask id="f_usertask_quality_problem_apply_1" name="质量问题反馈申请" activiti:assignee="${assignee1}" activiti:formKey="quality_problem_apply.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList1}" activiti:elementVariable="assignee1">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject1==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <sequenceFlow id="flow6" sourceRef="startevent1" targetRef="f_usertask_quality_problem_apply_1"></sequenceFlow>
-    <exclusiveGateway id="exclusivegateway2" name="Exclusive Gateway"></exclusiveGateway>
-    <sequenceFlow id="flow15" name="驳回" sourceRef="exclusivegateway2" targetRef="f_usertask_quality_problem_apply_1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_quality_problem_apply_1'}]]></conditionExpression>
-    </sequenceFlow>
-    <userTask id="f_usertask_quality_problem_check_3" name="项目计划变更复核" activiti:candidateUsers="${assigneeList3}" activiti:formKey="quality_problem_check.form"></userTask>
-    <sequenceFlow id="flow17" name="通过" sourceRef="exclusivegateway2" targetRef="f_usertask_quality_problem_check_3">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_quality_problem_check_3'}]]></conditionExpression>
-    </sequenceFlow>
-    <exclusiveGateway id="exclusivegateway3" name="Exclusive Gateway"></exclusiveGateway>
-    <sequenceFlow id="flow18" sourceRef="f_usertask_quality_problem_check_3" targetRef="exclusivegateway3"></sequenceFlow>
-    <sequenceFlow id="flow19" name="驳回" sourceRef="exclusivegateway3" targetRef="f_usertask_quality_problem_approve_2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_quality_problem_approve_2'}]]></conditionExpression>
-    </sequenceFlow>
-    <userTask id="f_usertask_quality_problem_third_check_4" name="乙方复核" activiti:candidateUsers="${assigneeList4}" activiti:formKey="quality_problem_check.form"></userTask>
-    <sequenceFlow id="flow20" name="通过" sourceRef="exclusivegateway3" targetRef="f_usertask_quality_problem_third_check_4">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_quality_problem_third_check_4'}]]></conditionExpression>
-    </sequenceFlow>
-    <exclusiveGateway id="exclusivegateway4" name="Exclusive Gateway"></exclusiveGateway>
-    <sequenceFlow id="flow21" sourceRef="f_usertask_quality_problem_third_check_4" targetRef="exclusivegateway4"></sequenceFlow>
-    <sequenceFlow id="flow22" name="驳回" sourceRef="exclusivegateway4" targetRef="f_usertask_quality_problem_approve_2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_quality_problem_approve_2'}]]></conditionExpression>
-    </sequenceFlow>
-    <endEvent id="f_usertask_quality_problem_end_0" name="结束"></endEvent>
-    <sequenceFlow id="flow23" name="通过" sourceRef="exclusivegateway4" targetRef="f_usertask_quality_problem_end_0">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_quality_problem_end_0'}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow24" sourceRef="f_usertask_quality_problem_apply_1" targetRef="f_usertask_quality_problem_approve_2"></sequenceFlow>
-    <sequenceFlow id="flow25" sourceRef="f_usertask_quality_problem_approve_2" targetRef="exclusivegateway2"></sequenceFlow>
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_QUALITY_PROBLEM_FLOW">
-    <bpmndi:BPMNPlane bpmnElement="QUALITY_PROBLEM_FLOW" id="BPMNPlane_QUALITY_PROBLEM_FLOW">
-      <bpmndi:BPMNShape bpmnElement="f_usertask_quality_problem_approve_2" id="BPMNShape_f_usertask_quality_problem_approve_2">
-        <omgdc:Bounds height="55.0" width="85.0" x="450.0" y="130.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
-        <omgdc:Bounds height="35.0" width="35.0" x="240.0" y="40.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_quality_problem_apply_1" id="BPMNShape_f_usertask_quality_problem_apply_1">
-        <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="130.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="exclusivegateway2" id="BPMNShape_exclusivegateway2">
-        <omgdc:Bounds height="40.0" width="40.0" x="472.0" y="240.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_quality_problem_check_3" id="BPMNShape_f_usertask_quality_problem_check_3">
-        <omgdc:Bounds height="55.0" width="105.0" x="440.0" y="330.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="exclusivegateway3" id="BPMNShape_exclusivegateway3">
-        <omgdc:Bounds height="40.0" width="40.0" x="680.0" y="337.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_quality_problem_third_check_4" id="BPMNShape_f_usertask_quality_problem_third_check_4">
-        <omgdc:Bounds height="55.0" width="105.0" x="648.0" y="480.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="exclusivegateway4" id="BPMNShape_exclusivegateway4">
-        <omgdc:Bounds height="40.0" width="40.0" x="472.0" y="487.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_quality_problem_end_0" id="BPMNShape_f_usertask_quality_problem_end_0">
-        <omgdc:Bounds height="35.0" width="35.0" x="475.0" y="590.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
-        <omgdi:waypoint x="257.0" y="75.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="130.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow15" id="BPMNEdge_flow15">
-        <omgdi:waypoint x="472.0" y="260.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="260.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="185.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="472.0" y="260.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow17" id="BPMNEdge_flow17">
-        <omgdi:waypoint x="492.0" y="280.0"></omgdi:waypoint>
-        <omgdi:waypoint x="492.0" y="330.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="492.0" y="280.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow18" id="BPMNEdge_flow18">
-        <omgdi:waypoint x="545.0" y="357.0"></omgdi:waypoint>
-        <omgdi:waypoint x="680.0" y="357.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow19" id="BPMNEdge_flow19">
-        <omgdi:waypoint x="700.0" y="337.0"></omgdi:waypoint>
-        <omgdi:waypoint x="699.0" y="157.0"></omgdi:waypoint>
-        <omgdi:waypoint x="535.0" y="157.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="700.0" y="337.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow20" id="BPMNEdge_flow20">
-        <omgdi:waypoint x="700.0" y="377.0"></omgdi:waypoint>
-        <omgdi:waypoint x="700.0" y="480.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="700.0" y="377.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow21" id="BPMNEdge_flow21">
-        <omgdi:waypoint x="648.0" y="507.0"></omgdi:waypoint>
-        <omgdi:waypoint x="512.0" y="507.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22">
-        <omgdi:waypoint x="472.0" y="507.0"></omgdi:waypoint>
-        <omgdi:waypoint x="202.0" y="506.0"></omgdi:waypoint>
-        <omgdi:waypoint x="202.0" y="239.0"></omgdi:waypoint>
-        <omgdi:waypoint x="492.0" y="185.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="472.0" y="507.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow23" id="BPMNEdge_flow23">
-        <omgdi:waypoint x="492.0" y="527.0"></omgdi:waypoint>
-        <omgdi:waypoint x="492.0" y="590.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="492.0" y="527.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow24" id="BPMNEdge_flow24">
-        <omgdi:waypoint x="300.0" y="157.0"></omgdi:waypoint>
-        <omgdi:waypoint x="450.0" y="157.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow25" id="BPMNEdge_flow25">
-        <omgdi:waypoint x="492.0" y="185.0"></omgdi:waypoint>
-        <omgdi:waypoint x="492.0" y="240.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

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

@@ -1 +0,0 @@
-[{"id":"120","code":"TEXT","type":"FORM","formId":"verify_point","formName":"verify_point","title":"核实情况简要","inputType":"STRING","required":true,"readable":false,"writable":true,"visable":true,"length":50,"name":"文本","span":12},{"id":"121","code":"TEXTAREA","type":"FORM","formId":"verify_remark","formName":"verify_remark","title":"核实情况备注","inputType":"STRING","required":false,"readable":false,"writable":true,"visable":true,"length":500,"name":"文本域","span":12},{"id":"122","code":"POP_SELECT","type":"FORM","formId":"approve_users","formName":"approve_users","title":"责任人多选","inputType":"STRING","required":false,"readable":false,"writable":true,"visable":true,"dataGrid":"/api/admin/common/get_org_user_list","name":"弹出选择框","span":6},{"id":"123","code":"SELECT","type":"FORM","formId":"problem_type","formName":"problem_type","title":"问题类型","inputType":"STRING","required":true,"readable":false,"writable":true,"visable":true,"dataGrid":"/api/admin/common/query_enum","name":"下拉框","span":6},{"id":"124","code":"POP_SELECT","type":"FORM","formId":"approve_check_users","formName":"approve_check_users","title":"复核人多选","inputType":"STRING","required":true,"readable":false,"writable":true,"visable":true,"dataGrid":"/api/admin/common/get_org_user_list","name":"弹出选择框","span":6},{"id":"125","code":"FILE","type":"FORM","formId":"attachment","formName":"attachment","title":"附图","inputType":"FILE","required":false,"readable":false,"writable":true,"visable":true,"name":"文件","span":6}]

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

@@ -1 +0,0 @@
-[{"id":"130","code":"LABEL","type":"FORM","formId":"approve_info","formName":"approve_info","title":"审批意见","inputType":"STRING","required":true,"readable":true,"writable":false,"visable":true,"name":"标签","span":12},{"id":"131","code":"RADIO","type":"FORM","formId":"agree","formName":"agree","title":"同意","inputType":"STRING","required":false,"readable":false,"writable":true,"visable":true,"name":"单选框","span":6},{"id":"132","code":"RADIO","type":"FORM","formId":"no_agree","formName":"agree","title":"不同意","inputType":"STRING","required":false,"readable":false,"writable":true,"visable":true,"name":"单选框","span":6},{"id":"133","code":"TEXTAREA","type":"FORM","formId":"approve_remark","formName":"approve_remark","inputType":"STRING","required":false,"readable":false,"writable":true,"visable":true,"name":"文本域","span":9},{"id":"134","code":"SIGN","type":"FORM","formId":"sign","formName":"sign","title":"添加签名","inputType":"STRING","required":false,"readable":false,"writable":true,"visable":true,"name":"签名","span":3}]

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

@@ -1 +0,0 @@
-{"approveRejectMap":{"f_usertask_quality_problem_approve_2":[{"afterFlowTaskKey":"f_usertask_quality_problem_apply_1","setup":1}],"f_usertask_quality_problem_check_3":[{"afterFlowTaskKey":"f_usertask_quality_problem_approve_2","setup":2}],"f_usertask_quality_problem_third_check_4":[{"afterFlowTaskKey":"f_usertask_quality_problem_approve_2","setup":2}]}}

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

@@ -1,111 +0,0 @@
-<?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_jwc_inside_approve_3" name="教务处sop_内审" activiti:assignee="${assignee3}" activiti:formKey="inside_approve.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList3}" activiti:elementVariable="assignee3">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject3==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <endEvent id="f_usertask_jwc_end_0" name="结束"></endEvent>
-    <userTask id="f_usertask_jwc_project_2" name="教务处sop_项目关键信息" activiti:assignee="${assignee2}" activiti:formKey="project.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList2}" activiti:elementVariable="assignee2">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject2==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <startEvent id="startevent1" name="Start"></startEvent>
-    <userTask id="f_usertask_jwc_start_1" name="新增sop" activiti:assignee="${assignee1}" activiti:formKey="start.form">
-      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList1}" activiti:elementVariable="assignee1">
-        <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject1==1}</completionCondition>
-      </multiInstanceLoopCharacteristics>
-    </userTask>
-    <sequenceFlow id="flow6" sourceRef="startevent1" targetRef="f_usertask_jwc_start_1"></sequenceFlow>
-    <exclusiveGateway id="exclusivegateway2" name="Exclusive Gateway"></exclusiveGateway>
-    <sequenceFlow id="flow12" name="通过" sourceRef="exclusivegateway2" targetRef="f_usertask_jwc_inside_approve_3">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_jwc_inside_approve_3'}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow14" sourceRef="f_usertask_jwc_start_1" targetRef="f_usertask_jwc_project_2"></sequenceFlow>
-    <sequenceFlow id="flow15" name="驳回" sourceRef="exclusivegateway2" targetRef="f_usertask_jwc_start_1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_jwc_start_1'}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow16" sourceRef="f_usertask_jwc_project_2" targetRef="exclusivegateway2"></sequenceFlow>
-    <exclusiveGateway id="exclusivegateway3" name="Exclusive Gateway"></exclusiveGateway>
-    <sequenceFlow id="flow17" sourceRef="f_usertask_jwc_inside_approve_3" targetRef="exclusivegateway3"></sequenceFlow>
-    <sequenceFlow id="flow18" name="通过" sourceRef="exclusivegateway3" targetRef="f_usertask_jwc_end_0">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_jwc_end_0'}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow19" name="驳回" sourceRef="exclusivegateway3" targetRef="f_usertask_jwc_project_2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_jwc_project_2'}]]></conditionExpression>
-    </sequenceFlow>
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_OFFICE_SOP_FLOW">
-    <bpmndi:BPMNPlane bpmnElement="OFFICE_SOP_FLOW" id="BPMNPlane_OFFICE_SOP_FLOW">
-      <bpmndi:BPMNShape bpmnElement="f_usertask_jwc_inside_approve_3" id="BPMNShape_f_usertask_jwc_inside_approve_3">
-        <omgdc:Bounds height="55.0" width="85.0" x="450.0" y="330.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_jwc_end_0" id="BPMNShape_f_usertask_jwc_end_0">
-        <omgdc:Bounds height="35.0" width="35.0" x="643.0" y="460.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_jwc_project_2" id="BPMNShape_f_usertask_jwc_project_2">
-        <omgdc:Bounds height="55.0" width="85.0" x="450.0" y="130.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
-        <omgdc:Bounds height="35.0" width="35.0" x="240.0" y="40.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_jwc_start_1" id="BPMNShape_f_usertask_jwc_start_1">
-        <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="130.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="exclusivegateway2" id="BPMNShape_exclusivegateway2">
-        <omgdc:Bounds height="40.0" width="40.0" x="472.0" y="240.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="exclusivegateway3" id="BPMNShape_exclusivegateway3">
-        <omgdc:Bounds height="40.0" width="40.0" x="640.0" y="337.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
-        <omgdi:waypoint x="257.0" y="75.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="130.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12">
-        <omgdi:waypoint x="492.0" y="280.0"></omgdi:waypoint>
-        <omgdi:waypoint x="492.0" y="330.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="492.0" y="280.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14">
-        <omgdi:waypoint x="300.0" y="157.0"></omgdi:waypoint>
-        <omgdi:waypoint x="450.0" y="157.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow15" id="BPMNEdge_flow15">
-        <omgdi:waypoint x="472.0" y="260.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="260.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="185.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="472.0" y="260.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow16" id="BPMNEdge_flow16">
-        <omgdi:waypoint x="492.0" y="185.0"></omgdi:waypoint>
-        <omgdi:waypoint x="492.0" y="240.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow17" id="BPMNEdge_flow17">
-        <omgdi:waypoint x="535.0" y="357.0"></omgdi:waypoint>
-        <omgdi:waypoint x="640.0" y="357.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow18" id="BPMNEdge_flow18">
-        <omgdi:waypoint x="660.0" y="377.0"></omgdi:waypoint>
-        <omgdi:waypoint x="660.0" y="460.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="660.0" y="377.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow19" id="BPMNEdge_flow19">
-        <omgdi:waypoint x="660.0" y="337.0"></omgdi:waypoint>
-        <omgdi:waypoint x="660.0" y="158.0"></omgdi:waypoint>
-        <omgdi:waypoint x="535.0" y="157.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="660.0" y="337.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

sop-task/src/main/java/com/qmth/sop/task/job/RemindTaskJob.java

@@ -65,7 +65,7 @@ public class RemindTaskJob extends QuartzJobBean {
                         String configKey = null, content = null;
                         if (Objects.nonNull(flowTaskSmsResult)) {
                             String[] strs = tsJobRemind.getObjName().split(";");
-                            if (tsJobRemind.getRemindType() == JobTypeEnum.BEFORE) {//教务处SOP和云阅卷SOP
+                            if (tsJobRemind.getRemindType() == JobTypeEnum.BEFORE) {//教务处SOP和研究生SOP
                                 content = MessageEnum.NOTICE_OF_SOP_DONE_REMIND.getTemplate();
                                 content = content.replaceAll("\\$\\{userName\\}", flowTaskSmsResult.getRealName());
                                 content = content.replaceAll("\\$\\{serviceName\\}", flowTaskSmsResult.getServiceName());