From 75afa1c132100a8c6409faf3df04e5ee7c871a6f Mon Sep 17 00:00:00 2001 From: L <L@123> Date: 星期四, 17 七月 2025 14:12:33 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java index 5ff7c65..b187187 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java @@ -67,6 +67,10 @@ @Scheduled(cron = "0/1 * * * * ? ") private void execute(){ + RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo")); + if (rgvTwoSign.getRgvOneSign()!=0){ + return; + } List<Integer> integersStaArr = new ArrayList<>(); List<int[]> stalistArr = new ArrayList<>(); for(Integer staNo : STA_WORK_CU){ @@ -157,6 +161,10 @@ @Scheduled(cron = "0/1 * * * * ? ") private void execute2(){ + RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo")); + if (rgvTwoSign.getRgvOneSign()!=0){ + return; + } try{ List<Integer> integersStaArr = new ArrayList<>(); List<int[]> stalistArr = new ArrayList<>(); @@ -166,10 +174,7 @@ new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("wrk_sts", 11L)); stalistArr.add(new int[]{staNo, selectCount}); } - -// 鎸塻electCount闄嶅簭鎺掑簭锛堟渶澶х殑鎺掔涓�浣嶏級 - Collections.sort(stalistArr, (a, b) -> b[1] - a[1]); // 闄嶅簭鎺掑垪 -// 濡傛灉鎮ㄩ渶瑕佽浆涓烘暟缁勶紙鍙�夛級 + Collections.sort(stalistArr, (a, b) -> b[1] - a[1]); for (int[] staNowArr : stalistArr){ integersStaArr.add(staNowArr[0]); } -- Gitblit v1.9.1