From 728621ba2f24bb9f41c7f2cd1c6cdc990247928c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 16:58:36 +0800
Subject: [PATCH] 优化同步WorkOrder:先全部删除,再进行同步

---
 aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java         |    2 ++
 aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml                |    4 ++++
 aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java            |    2 ++
 aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java                             |    1 +
 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java |   10 +++++-----
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java
index a93829d..a17d167 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java
@@ -95,4 +95,6 @@
     int batchInsertGasPiping();
 
     List<ApsWorkOrderJob> selectApsWorkOrderJobListDocNoNotNull(ApsWorkOrderJob apsWorkOrderJob);
+
+    int deleteAllWorkOrderJob();
 }
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java
index 85dc42b..cc42698 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java
@@ -81,4 +81,6 @@
 
     @Transactional
     void syncGasPipingData();
+
+    void deleteAllWorkOrderJob();
 }
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
index 8c8762d..f28a820 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -315,11 +315,6 @@
             }
         }
 
-        if (!orderIds.isEmpty()) {
-            // 鍒犻櫎鏃ф暟鎹�
-            apsWorkOrderJobMapper.deleteWorkOrderJobByOrderIds(orderIds);
-        }
-
         // 鎵归噺鎻掑叆鏂版暟鎹�
         int affectedRows = apsWorkOrderJobMapper.batchInsertApsWorkOrderJob(jobs);
 
@@ -362,4 +357,9 @@
         apsWorkOrderJobMapper.batchInsertGasPiping();
     }
 
+    @Override
+    public void deleteAllWorkOrderJob(){
+         apsWorkOrderJobMapper.deleteAllWorkOrderJob();
+    }
+
 }
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java b/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
index ed72422..dbbdb6a 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
@@ -119,6 +119,7 @@
     public void syncAllWorkOrder()
     {
 
+        iApsWorkOrderJobService.deleteAllWorkOrderJob();
         boolean continueFlag = true;
         Integer currentPage = 1;
         ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
index 7b9e913..32367af 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
@@ -466,4 +466,8 @@
         where ( doc_status in (0,1,2,4) and is_hold_release='0'
             and (item_code like 'A65%' or item_code like 'W%'));
     </insert>
+
+    <delete id="deleteAllWorkOrderJob" >
+        delete from aps_work_order_job where del_flag in ('0','1')
+    </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3