From 61c4c3f45e4257e2e7662f033e2719e62366c632 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 31 三月 2026 23:02:22 +0800
Subject: [PATCH] feat: 优化申请发票，还可以修改发票信息

---
 ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml |   26 +++++++++++++++++---------
 1 files changed, 17 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 050beae..bbe6068 100644
--- a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
@@ -46,6 +46,8 @@
         <result property="DispatchOrdState" column="DispatchOrdState" />
         <result property="DispatchOrdNo" column="DispatchOrdNo" />
         <result property="DispatchOrdClass" column="DispatchOrdClass" />
+        <result property="ServiceOrdVIP" column="ServiceOrdVIP" />
+        <result property="FromHQ_is" column="FromHQ_is" />
         <result property="DispatchOrd_NS_Time" column="DispatchOrd_NS_Time" />
 
     </resultMap>
@@ -57,12 +59,14 @@
         <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.FromHQ_is,
+            a.ServiceOrdVIP,
             a.ServiceOrdTraVia,
             a.ServiceOrdApptDate,
             a.ServiceOrd_NS_ID,
@@ -98,15 +102,15 @@
             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
+        LEFT JOIN DispatchOrd b ON a.ServiceOrdID = b.ServiceOrdIDDt
         WHERE a.ServiceOrdState &lt;= 3
-            AND a.ServiceOrd_CC_Time > #{startDate} 
-            
+            AND a.ServiceOrd_CC_Time > #{startDate}
+            AND a.ServiceOrd_CC_Time &lt; #{endDate}
+            AND a.ServiceOrdID > #{lastId}
+        ORDER BY a.ServiceOrdID
     </select>
     
     <!-- 鏍规嵁鏈嶅姟鍗旾D鍜岃皟搴﹀崟ID鏌ヨ杞繍鍗曟暟鎹� -->
@@ -115,6 +119,8 @@
             a.ServiceOrdID,
             a.Old_ServiceOrdID_TXT,
             a.ServiceOrdTraVia,
+            a.FromHQ_is,
+            a.ServiceOrdVIP,
             a.ServiceOrdNo,
             a.ServiceOrdApptDate,
             a.ServiceOrdUserID,
@@ -165,6 +171,8 @@
         SELECT
         a.ServiceOrdID,
         a.Old_ServiceOrdID_TXT,
+        a.FromHQ_is,
+        a.ServiceOrdVIP,
         a.ServiceOrdTraVia,
         a.ServiceOrdNo,
         a.ServiceOrdApptDate,

--
Gitblit v1.9.1