代码修改

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

@@ -1048,8 +1048,26 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
             String execField = null;
             if (tfCustomFlow.getType() == TFCustomTypeEnum.OFFICE_SOP_FLOW) {//教务处sop
                 FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
-                processLimitedTime = tfFlowApprove.getUpdateTime();
-                execField = ProcessLimitedEnum.FLOW_TASK.getKey();
+                if (tfFlowApprove.getSetup().intValue() == 2) {//扫描准备流程
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
+                            ProcessLimitedEnum.SCAN_START_TIME.getKey());
+                    execField = ProcessLimitedEnum.SCAN_START_TIME.getKey();
+                } else if (tfFlowApprove.getSetup().intValue() == 3) {//扫描收尾检查
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
+                            ProcessLimitedEnum.SCAN_END_TIME.getKey());
+                    execField = ProcessLimitedEnum.SCAN_END_TIME.getKey();
+                } else if (tfFlowApprove.getSetup().intValue() == 4) {//阅卷参数检查
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
+                            ProcessLimitedEnum.MARK_START_TIME.getKey());
+                    execField = ProcessLimitedEnum.MARK_START_TIME.getKey();
+                } else if (tfFlowApprove.getSetup().intValue() == 5) {//阅卷收尾检查
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
+                            ProcessLimitedEnum.MARK_END_TIME.getKey());
+                    execField = ProcessLimitedEnum.MARK_END_TIME.getKey();
+                }
+                //                FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
+                //                processLimitedTime = tfFlowApprove.getUpdateTime();
+                //                execField = ProcessLimitedEnum.FLOW_TASK.getKey();
                 tbSopInfoService.saveSopPlanDate(flowTaskResult, sopId, tfCustomFlowEntity.getFlowId(), sysUser.getId(),
                         tfCustomFlow.getType());
             } else if (tfCustomFlow.getType() == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {//研究生sop
@@ -1063,12 +1081,12 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                         tsJobRemindList.add(new TSJobRemind(JobQuartzTypeEnum.FLOW, tfCustomFlowEntity.getCode(),
                                 Long.parseLong(task.getId()), tfCustomFlow.getType().getTitle() + ";" + task.getName(),
                                 JobTypeEnum.BEFORE, Long.parseLong(task.getAssignee()), tfFlowLog.getApproveOperation(),
-                                processLimitedTime, ProcessLimitedEnum.FLOW_TASK_BEFORE.getKey(), sysUser.getId(),
+                                processLimitedTime, execField, sysUser.getId(),
                                 tfCustomFlowEntity.getCrmNo()));
                         tsJobRemindList.add(new TSJobRemind(JobQuartzTypeEnum.FLOW, tfCustomFlowEntity.getCode(),
                                 Long.parseLong(task.getId()), tfCustomFlow.getType().getTitle() + ";" + task.getName(),
                                 JobTypeEnum.AFTER, Long.parseLong(task.getAssignee()), tfFlowLog.getApproveOperation(),
-                                processLimitedTime, ProcessLimitedEnum.FLOW_TASK_AFTER.getKey(), sysUser.getId(),
+                                processLimitedTime, execField, sysUser.getId(),
                                 tfCustomFlowEntity.getCrmNo()));
                     } else {
                         List<IdentityLink> identityLinkList = taskService.getIdentityLinksForTask(task.getId());
@@ -1080,7 +1098,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                                                 tfCustomFlow.getType().getTitle() + ";" + task.getName(),
                                                 JobTypeEnum.BEFORE, Long.parseLong(i.getUserId()),
                                                 tfFlowLog.getApproveOperation(), processLimitedTime,
-                                                ProcessLimitedEnum.FLOW_TASK_BEFORE.getKey(), sysUser.getId(),
+                                                execField, sysUser.getId(),
                                                 tfCustomFlowEntity.getCrmNo()));
                                 tsJobRemindList.add(
                                         new TSJobRemind(JobQuartzTypeEnum.FLOW, tfCustomFlowEntity.getCode(),
@@ -1088,7 +1106,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                                                 tfCustomFlow.getType().getTitle() + ";" + task.getName(),
                                                 JobTypeEnum.AFTER, Long.parseLong(i.getUserId()),
                                                 tfFlowLog.getApproveOperation(), processLimitedTime,
-                                                ProcessLimitedEnum.FLOW_TASK_AFTER.getKey(), sysUser.getId(),
+                                                execField, sysUser.getId(),
                                                 tfCustomFlowEntity.getCrmNo()));
                             }
                         }

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

@@ -17,9 +17,9 @@ public enum ProcessLimitedEnum {
 
     SCAN_END_TIME("scan_end_time", "扫描结束时间"),
 
-    MARK_START_TIME("mark_start_time", "评卷开始时间"),
+    MARK_START_TIME("mark_start_time", "阅卷开始时间"),
 
-    MARK_END_TIME("mark_end_time", "评卷结束时间"),
+    MARK_END_TIME("mark_end_time", "阅卷结束时间"),
 
     SERVICE_FINISH_PLAN_DATE("service_finish_plan_date", "现场服务完成撤场计划时间"),