修改巡检计划新增时不开启时间设置

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/impl/CmmsInspectPlanServiceImpl.java

@@ -95,12 +95,15 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
     public boolean addCmmsInspectPlan(CmmsInspectPlanVo cmmsInspectPlan) {
         CmmsInspectPlan inspectPlan = new CmmsInspectPlan();
         PlanToOrderUtils planToOrderUtils = new PlanToOrderUtils();
-        // 下次执行时间
-        cmmsInspectPlan.setNexttime(cmmsInspectPlan.getBegintime());
-        // 是否已经通知
-        cmmsInspectPlan.setIfnotice("否");
-        // 下次通知时间
-        cmmsInspectPlan.setNoticetime(planToOrderUtils.generateNoticeTime(cmmsInspectPlan.getBegintime(),cmmsInspectPlan.getNoticenum(),cmmsInspectPlan.getNoticetype()));
+        // 由于前端可以选择是否开启时间设置，所以如果为"是"，则根据开始时间、重复周期、提前通知时间(1天小时分钟...)，生成下次执行时间、下次通知时间
+        if("Y".equals(cmmsInspectPlan.getIftimeset())){
+            // 下次执行时间
+            cmmsInspectPlan.setNexttime(cmmsInspectPlan.getBegintime());
+            // 是否已经通知
+            cmmsInspectPlan.setIfnotice("否");
+            // 下次通知时间
+            cmmsInspectPlan.setNoticetime(planToOrderUtils.generateNoticeTime(cmmsInspectPlan.getBegintime(),cmmsInspectPlan.getNoticenum(),cmmsInspectPlan.getNoticetype()));
+        }
         // 巡检计划编码
         if (cmmsInspectPlan.getPlancode() == null || "".equals(cmmsInspectPlan.getPlancode())){
             cmmsInspectPlan.setPlancode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTPLAN_CODE, null));
@@ -215,10 +218,9 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
                     taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineById(relid));
                 }
             }
+            cmmsInspectPlanVo.setTaskList(taskList);
         }
 
-        cmmsInspectPlanVo.setTaskList(taskList);
-
         return cmmsInspectPlanVo;
     }
 
@@ -288,15 +290,17 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
         // 操作节点
         List<CmmsOrderNode> nodeList = new ArrayList<>();
 
-        // 更新下次执行时间的巡检计划
-        Date nextTime = planToOrderUtils.generateNextTime(plan.getRepeatnum(), plan.getRepeattype());
-        plan.setNexttime(nextTime);
-        Date noticeTime = planToOrderUtils.generateNoticeTime(nextTime, plan.getNoticenum(), plan.getNoticetype());
-        plan.setNoticetime(noticeTime);
-        plan.setIfnotice("否");
-        resreshPlanList.add(plan);
-        inspectPlanMapper.refreshNextTime(resreshPlanList);
 
+        if ("Y".equals(plan.getIftimeset())){
+            // 更新下次执行时间的巡检计划
+            Date nextTime = planToOrderUtils.generateNextTime(plan.getRepeatnum(), plan.getRepeattype());
+            plan.setNexttime(nextTime);
+            Date noticeTime = planToOrderUtils.generateNoticeTime(nextTime, plan.getNoticenum(), plan.getNoticetype());
+            plan.setNoticetime(noticeTime);
+            plan.setIfnotice("否");
+            resreshPlanList.add(plan);
+            inspectPlanMapper.refreshNextTime(resreshPlanList);
+        }
 
         // 巡检工单生成
         CmmsInspect inspect = new CmmsInspect();
@@ -308,7 +312,7 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
             inspect.setTasktype("周期任务");
         }
         else {
-            inspect.setTasktype("周期任务");
+            inspect.setTasktype("单次任务");
         }
         inspect.setChargeruser(plan.getChargeruser());
         inspect.setStatus("0");