巡检任务定点执行

op-modules/op-job/src/main/java/com/op/job/task/RyTask.java

@@ -155,7 +155,7 @@ public class RyTask {
 	}
 
 	/************质量管理系统定时任务开始*****************/
-	//过程巡检，每15分钟执行一次
+	//过程巡检，改为整点08：00-20：00运行
 	public void createProduceXJTask(){
 		logger.info("++质量管理系统+过程巡检+开始++createProduceXJTask+++++");
 		remoteQualityService.createProduceXJTask();

op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java

@@ -189,6 +189,12 @@ public class QuaController extends BaseController {
         if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){
             return error("[List<QcCheckTaskDetail>]不能为空");
         }
+        if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){
+            return error("[updateBy]不能为空");
+        }
+        if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){
+            return error("[updateByName]不能为空");
+        }
         return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome));
     }
     /**

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java

@@ -383,14 +383,14 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 		for(QcCheckTaskProduce productTask:works){
 			productTask.setCheckType("checkTypeSCXJ");//过程检验-巡检
 			productTask.setOrderNo(productTask.getWorkorderCode());
-            Date nowTime = DateUtils.getNowDate();
+//            Date nowTime = DateUtils.getNowDate();
-            Date startTime = productTask.getCreateTime();
+//            Date startTime = productTask.getCreateTime();
 
-			long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE);
+//			long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE);
-			if(mins>=60){
+//			if(mins>=60){
 				int m = insertQcCheckTaskProduce(productTask);
 				logger.info("++++++++++++过程检验巡检任务生成" + m + "++++++++++++++");
-			}
+//			}
 		}
 		logger.info("++++++++++++" + poolName + "++++过程检验巡检结束++++++++++");
 	}