研究生sop流程修改

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -381,7 +381,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
      */
     public List<String> getNextApproveUserIds(TFCustomTypeEnum type, FlowTaskResult flowTaskResult, TBSopInfoDetail tbSopInfoDetail) {
         List<String> approveUserIds = null;
-        if (type == TFCustomTypeEnum.OFFICE_SOP_FLOW) {//教务处sop流程待审核人
+        if (type == TFCustomTypeEnum.OFFICE_SOP_FLOW) {
             if (flowTaskResult.getSetup().intValue() == 1) {
                 approveUserIds = Arrays.asList(String.valueOf(tbSopInfoDetail.getRegionUserId()));
             } else if (flowTaskResult.getSetup().intValue() == 2 || flowTaskResult.getSetup().intValue() == 4) {
@@ -390,7 +390,13 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                 approveUserIds = Arrays.asList(String.valueOf(tbSopInfoDetail.getEngineerUserId()));
             }
         } else if (type == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {//研究生sop流程待审核人
-
+            if (flowTaskResult.getSetup().intValue() == 1) {
+                approveUserIds = Arrays.asList(String.valueOf(tbSopInfoDetail.getRegionUserId()));
+            } else if (flowTaskResult.getSetup().intValue() == 2 || flowTaskResult.getSetup().intValue() == 5) {
+                approveUserIds = Arrays.asList(String.valueOf(tbSopInfoDetail.getLeadId()));
+            } else {
+                approveUserIds = Arrays.asList(String.valueOf(tbSopInfoDetail.getEngineerUserId()));
+            }
         }
         return approveUserIds;
     }
@@ -547,7 +553,37 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                     execField = SystemConstant.SERVICE_FINISH_PLAN_DATE;
                 }
             } else if (tfCustomFlow.getType() == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {//研究生sop
-
+                if (tfFlowApprove.getSetup().intValue() == 2) {//项目关键信息
+                    FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.PROJECT_KEY_INFO_DATE);
+                    execField = SystemConstant.PROJECT_KEY_INFO_DATE;
+                } else if (tfFlowApprove.getSetup().intValue() == 3 || tfFlowApprove.getSetup().intValue() == 4) {//大区经理内审或工程师内审
+                    processLimitedTime = tfFlowApprove.getUpdateTime();
+                } else if (tfFlowApprove.getSetup().intValue() == 5) {//环境部署时间
+                    FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.ENV_DEPLOYMENT_TIME);
+                    execField = SystemConstant.ENV_DEPLOYMENT_TIME;
+                } else if (tfFlowApprove.getSetup().intValue() == 7) {//扫描准备
+                    FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SCAN_START_TIME);
+                    execField = SystemConstant.SCAN_START_TIME;
+                } else if (tfFlowApprove.getSetup().intValue() == 8) {//校验收尾
+                    FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SCAN_END_TIME);
+                    execField = SystemConstant.SCAN_END_TIME;
+                } else if (tfFlowApprove.getSetup().intValue() == 9) {//评卷准备
+                    FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.MARK_START_TIME);
+                    execField = SystemConstant.MARK_START_TIME;
+                } else if (tfFlowApprove.getSetup().intValue() == 10) {//成绩复核
+                    FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.MARK_END_TIME);
+                    execField = SystemConstant.MARK_END_TIME;
+                } else if (tfFlowApprove.getSetup().intValue() == 12) {//设备入库登记
+                    FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SERVICE_FINISH_PLAN_DATE);
+                    execField = SystemConstant.SERVICE_FINISH_PLAN_DATE;
+                }
             }
             List<TSJobRemind> tsJobRemindList = new ArrayList<>();
             if (Objects.nonNull(task.getAssignee())) {

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -129,6 +129,11 @@ public class SystemConstant {
     public static final String MARK_END_TIME = "mark_end_time";//评卷结束时间
     public static final String SERVICE_FINISH_PLAN_DATE = "service_finish_plan_date";//现场服务完成撤场计划时间
 
+    /**
+     * 研究生SOP处理时限字段
+     */
+    public static final String ENV_DEPLOYMENT_TIME = "env_deployment_time";//环境部署时间
+
     //质量问题反馈
     public static final String PROBLEM_POINT = "problem_point";
     public static final String PROBLEM_REMARK = "problem_remark";