From 40a8157440e3b906da8f52e07d939d78c3f4c313 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 12 四月 2026 16:14:06 +0800
Subject: [PATCH] feat: 任务增加统计、同步增加通知

---
 ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
index ce3ae5c..6dbccfb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
@@ -59,9 +59,9 @@
         <result property="EntourageState" column="EntourageState" />
     </resultMap>
     
-    <!-- 鏌ヨ鎸囧畾鏃ユ湡鑼冨洿鐨勮浆杩愬崟鏁版嵁 -->
+    <!-- 鏌ヨ鎸囧畾鏃ユ湡鑼冨洿鐨勮浆杩愬崟鏁版嵁锛圞eyset娓告爣鍒嗛〉锛岃蛋涓婚敭绱㈠紩锛屽交搴曡閬胯秴鏃讹級 -->
     <select id="selectTransferOrders" resultMap="TransferOrderResult">
-        SELECT 
+        SELECT TOP (${pageSize})
             a.ServiceOrdID,
             a.Old_ServiceOrdID_TXT,
             a.ServiceOrdNo,
@@ -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 &lt; #{endDate}
-            
+            AND a.ServiceOrd_CC_Time between #{startDate} and #{endDate}
+            AND a.ServiceOrdID > #{lastId}
+        ORDER BY a.ServiceOrdID
     </select>
     
     <!-- 鏍规嵁鏈嶅姟鍗旾D鍜岃皟搴﹀崟ID鏌ヨ杞繍鍗曟暟鎹� -->

--
Gitblit v1.9.1