From ee84f9b8ed93ad00533809a3c95942717fdb6499 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 May 2024 09:45:45 +0800
Subject: [PATCH] =?UTF-8?q?2024-5-6=20=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?-=E5=8D=95=E6=AC=A1=E4=BF=9D=E5=85=BB=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/device/service/impl/DeviceTaskServiceImpl.java    | 5 ++++-
 .../java/com/op/device/service/impl/EquPlanServiceImpl.java  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
index f9bdb462..39d334e7 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
@@ -303,8 +303,11 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
                 hasTask = deviceTaskMapper.getNewTaskOrder(plan);
             } else if ("2".equals(plan.getCalculationRule())) {
                 //单次生成保养计划
+                //根据planLoopStart 单次生成
+               if(plan.getPlanLoopStart().getTime() == DateUtils.getNowDate().getTime()){
+                   hasTask = null;
+               }
             }
-
             if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays() || checkHourTask(hasTask, plan)) {
                 //生成保养计划
                 int m = this.createOrderPlan(plan);
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
index 96df2cc7..010e4869 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
@@ -145,7 +145,7 @@ public class EquPlanServiceImpl implements IEquPlanService {
 
         equPlan.setPlanId(IdUtils.fastSimpleUUID());// 计划id
         equPlan.setPlanCode((DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + planSerialNum));// 计划编码
-        if (equPlan.getPlanTimeArray().size() > 0) {
+        if (equPlan.getPlanTimeArray() != null) {
             equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间
             equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间
         }
@@ -174,7 +174,7 @@ public class EquPlanServiceImpl implements IEquPlanService {
     @DS("#header.poolName")
     public AjaxResult updateEquPlan(EquPlan equPlan) {
         // 设置循环范围时间
-        if (equPlan.getPlanTimeArray().size() != 0) {
+        if (equPlan.getPlanTimeArray() != null) {
             equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 循环开始时间
             equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 循环结束时间
         }