From d372d7d03bd553d369e0fcb0fb9c20f1e4155f8a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 29 二月 2024 17:23:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/BareBoardScheduler.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 19bb983..1ed97c3 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -35,7 +35,7 @@
     @Autowired
     private WrkMastStaService wrkMastStaService;
 
-    @Scheduled(cron = "0/3 * * * * ? ")
+//    @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
         Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
         if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
@@ -46,14 +46,16 @@
         }
     }
 
-    @Scheduled(cron = "0/3 * * * * ? ")
+//    @Scheduled(cron = "0/3 * * * * ? ")
     private void executeOne(){//鑷姩璋冪┖鏉垮嚭搴� 1妤肩爜鍨涗綅缃�
         Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
         if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
             boolean sign = true;
             WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
                     .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
-            if (Cools.isEmpty(wrkMastSta)){
+            WrkMastSta wrkMastSta2 = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+                    .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
+            if (Cools.isEmpty(wrkMastSta) || !Cools.isEmpty(wrkMastSta2)){
                 sign=false;
             }
             RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));

--
Gitblit v1.9.1