From b9e9cde65890851f4ca2d7b4809b802b88937ddf Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 01 四月 2026 23:05:48 +0800
Subject: [PATCH] 　feat:同步状态优化

---
 ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
index 5ecdb9a..6dbccfb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
@@ -47,7 +47,7 @@
         <result property="DispatchOrdNo" column="DispatchOrdNo" />
         <result property="DispatchOrdClass" column="DispatchOrdClass" />
         <result property="ServiceOrdVIP" column="ServiceOrdVIP" />
-        <result property="FromHQ2_is" column="FromHQ2_is" />
+        <result property="FromHQ_is" column="FromHQ_is" />
         <result property="DispatchOrd_NS_Time" column="DispatchOrd_NS_Time" />
 
     </resultMap>
@@ -59,13 +59,13 @@
         <result property="EntourageState" column="EntourageState" />
     </resultMap>
     
-    <!-- 鏌ヨ鎸囧畾鏃ユ湡鑼冨洿鐨勮浆杩愬崟鏁版嵁 -->
+    <!-- 鏌ヨ鎸囧畾鏃ユ湡鑼冨洿鐨勮浆杩愬崟鏁版嵁锛圞eyset娓告爣鍒嗛〉锛岃蛋涓婚敭绱㈠紩锛屽交搴曡閬胯秴鏃讹級 -->
     <select id="selectTransferOrders" resultMap="TransferOrderResult">
-        SELECT 
+        SELECT TOP (${pageSize})
             a.ServiceOrdID,
             a.Old_ServiceOrdID_TXT,
             a.ServiceOrdNo,
-            a.FromHQ2_is,
+            a.FromHQ_is,
             a.ServiceOrdVIP,
             a.ServiceOrdTraVia,
             a.ServiceOrdApptDate,
@@ -102,15 +102,21 @@
             a.ServiceOrdPtServices,
             a.ServiceOrdPtInServices,
             a.ServiceOrdPtName,
-            b.DispatchOrdState,            
             b.DispatchOrdNo,
-            b.DispatchOrdClass,
-            a.ServiceOrdClass  
-        FROM ServiceOrder as a 
-        left JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
+            b.DispatchOrdClass
+        FROM ServiceOrder AS a
+        OUTER APPLY (
+            SELECT TOP 1
+            DispatchOrd_NS_Time, DispatchOrdTraStreet, DispatchOrdStartDate,
+            DispatchOrdActualDate, DispatchOrdReturnDate, DispatchOrdTraEnd,
+            DispatchOrdState, DispatchOrdID, DispatchOrdCarID, DispatchOrdNo, DispatchOrdClass
+            FROM DispatchOrd b
+            WHERE b.ServiceOrdIDDt = a.ServiceOrdID
+        ) b
         WHERE a.ServiceOrdState &lt;= 3
-            AND a.ServiceOrd_CC_Time > #{startDate} 
-            
+            AND a.ServiceOrd_CC_Time between #{startDate} and #{endDate}
+            AND a.ServiceOrdID > #{lastId}
+        ORDER BY a.ServiceOrdID
     </select>
     
     <!-- 鏍规嵁鏈嶅姟鍗旾D鍜岃皟搴﹀崟ID鏌ヨ杞繍鍗曟暟鎹� -->
@@ -119,7 +125,7 @@
             a.ServiceOrdID,
             a.Old_ServiceOrdID_TXT,
             a.ServiceOrdTraVia,
-             a.FromHQ2_is,
+            a.FromHQ_is,
             a.ServiceOrdVIP,
             a.ServiceOrdNo,
             a.ServiceOrdApptDate,
@@ -171,7 +177,7 @@
         SELECT
         a.ServiceOrdID,
         a.Old_ServiceOrdID_TXT,
-        a.FromHQ2_is,
+        a.FromHQ_is,
         a.ServiceOrdVIP,
         a.ServiceOrdTraVia,
         a.ServiceOrdNo,

--
Gitblit v1.9.1