From 5282d7c647c44567f79d4d5b570480da5cb8bd17 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 25 三月 2024 13:40:44 +0800
Subject: [PATCH] #细节处理
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 6 +++---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 8a13a9c..c080f45 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -51,11 +51,11 @@
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>()
+ List<WrkMastSta> wrkMastStas = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
- WrkMastSta wrkMastSta2 = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+ List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
- if (Cools.isEmpty(wrkMastSta) || !Cools.isEmpty(wrkMastSta2)){
+ if (Cools.isEmpty(wrkMastStas) || wrkMastStas.size()==0 || !Cools.isEmpty(wrkMastStaList) || wrkMastStaList.size()!=0){
sign=false;
}
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index fc4e244..c14da80 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -32,7 +32,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
- if (wrkMasts.isEmpty()) {
+ if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
return;
}
for (WrkMast wrkMast : wrkMasts) {
@@ -51,7 +51,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute3(){
List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData2();
- if (wrkMasts.isEmpty()) {
+ if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
return;
}
for (WrkMast wrkMast : wrkMasts) {
--
Gitblit v1.9.1