From 62662f5a8a0259ab934a09326768f1fb933319d4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 11 三月 2025 17:55:15 +0800
Subject: [PATCH] zjh20250311

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 8f666a2..6e30281 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -198,9 +198,22 @@
                 awsService.saveBatch(awsList);
                 log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
             }
-            List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
             List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
-            if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
+            if(null !=wssq && !wssq.isEmpty()){
+                for (LtkjHysqd hysqd : wssq) {
+                    LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+                    if (null != jybgid) {
+                        ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+                        ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
+                    }
+                    if (ltkjHysqdService.save(hysqd)) {
+                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+                        ltkjHybgdService.saveBatch(wsbg);
+                    }
+                }
+            }
+
+            List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
             if (null != hysqdList && !hysqdList.isEmpty()) {
                 for (LtkjHysqd hysqd : hysqdList) {
                     LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -210,8 +223,8 @@
                     }
                     if (ltkjHysqdService.save(hysqd)) {
                         List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
-                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
-                        if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
+//                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+//                        if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
                         ltkjHybgdService.saveBatch(hybgdList);
                     }
                 }

--
Gitblit v1.8.0