From 8b7e2c47b56bfe506ffd32b4f6268c5525248d7f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Dec 2022 17:37:11 +0800
Subject: [PATCH] 20221130

---
 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index b84d495..e534334 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -293,7 +293,11 @@
         DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
         DateTime date = DateUtil.date();
         DateTime endTime = DateUtil.parseTimeToday(endTimeDic.getValue());
-        if(DateUtil.compare(date,endTime)>=0){
+
+        //系统开关
+        DataDictionaryCustom onOff = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.ON_OFF.getType(), DataDictionaryEnum.ON_OFF.getCode());
+        String onOffStr = onOff.getValue() == null ? "OFF":onOff.getValue();
+        if(DateUtil.compare(date,endTime)>=0 || "ON".equals(onOffStr)){
             igtOnHookPlanOrderDao.updatePlanOrder();
         }
     }

--
Gitblit v1.9.1