From 09e6dc3fb7266620fafb5e341808a8eb36e080a1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 13 十二月 2025 22:51:52 +0800
Subject: [PATCH] feat:增加企业微信消息提醒

---
 ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
index 906b028..4b29293 100644
--- a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
@@ -44,6 +44,10 @@
         <result property="ServiceOrdTraDistance" column="ServiceOrdTraDistance" />
         <result property="ServiceOrdApptDate" column="ServiceOrdApptDate" />
         <result property="DispatchOrdState" column="DispatchOrdState" />
+        <result property="DispatchOrdNo" column="DispatchOrdNo" />
+        <result property="DispatchOrdClass" column="DispatchOrdClass" />
+        <result property="DispatchOrd_NS_Time" column="DispatchOrd_NS_Time" />
+
     </resultMap>
     
     <!-- 鎵ц浜虹粨鏋滄槧灏� -->
@@ -93,7 +97,11 @@
             b.DispatchOrdCarID,
             a.ServiceOrdPtServices,
             a.ServiceOrdPtInServices,
-            a.ServiceOrdPtName
+            a.ServiceOrdPtName,
+            b.DispatchOrdState,            
+            b.DispatchOrdNo,
+            b.DispatchOrdClass,
+            a.ServiceOrdClass  
         FROM ServiceOrder as a 
         left JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
         WHERE a.ServiceOrdState &lt;= 3
@@ -111,6 +119,7 @@
             a.ServiceOrdApptDate,
             a.ServiceOrdUserID,
             a.ServiceOrd_NS_ID,
+            a.ServiceOrd_NS_Time,
             a.ServiceOrd_CC_ID,
             a.ServiceOrd_CC_Time,
             a.ServiceOrdAreaType,
@@ -140,13 +149,115 @@
             a.ServiceOrdPtServices,
             a.ServiceOrdPtInServices,
             a.ServiceOrdPtName,
-            b.DispatchOrdState
+            b.DispatchOrdState,            
+            b.DispatchOrdNo,
+            b.DispatchOrdClass,
+            a.ServiceOrdClass           
+
         FROM ServiceOrder as a 
         left JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
-        WHERE a.ServiceOrdID = #{serviceOrdID}
+        WHERE a.ServiceOrdID = #{serviceOrdID} 
+            AND (b.DispatchOrdID = #{dispatchOrdID} OR #{dispatchOrdID} IS NULL)
             AND a.ServiceOrdState &lt;=3
 
     </select>
+    <select id="selectByServiceOrdId" resultMap="TransferOrderResult">
+        SELECT
+        a.ServiceOrdID,
+        a.Old_ServiceOrdID_TXT,
+        a.ServiceOrdTraVia,
+        a.ServiceOrdNo,
+        a.ServiceOrdApptDate,
+        a.ServiceOrdUserID,
+        a.ServiceOrd_NS_ID,
+        a.ServiceOrd_NS_Time,
+        a.ServiceOrd_CC_ID,
+        a.ServiceOrd_CC_Time,
+        a.ServiceOrdAreaType,
+        a.ServiceOrdType,
+        a.ServiceOrdPtSex,
+        a.ServiceOrdTraTxnPrice,
+        a.ServiceOrdPtOutHospID,
+        a.ServiceOrdPtServicesID,
+        a.ServiceOrdPtInHospID,
+        a.ServiceOrdPtInServicesID,
+        a.ServiceOrdCoTies,
+        a.ServiceOrdCoName,
+        a.ServiceOrdTraDistance,
+        a.ServiceOrdCoPhone,
+        a.ServiceOrdClass,
+        a.ServiceOrdTraStreet,
+        a.ServiceOrdTraEnd,
+        a.ServiceOrdPtCondition,
+        b.DispatchOrd_NS_Time,
+        a.ServiceOrdState,
+        a.ServiceOrdPtIDCard,
+        b.DispatchOrdTraStreet,
+        b.DispatchOrdStartDate,
+        b.DispatchOrdTraEnd,
+        b.DispatchOrdID,
+        b.DispatchOrdCarID,
+        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
+        WHERE a.ServiceOrdID = #{serviceOrdID}
+    </select>
+    <select id="selectByDispatchId" resultMap="TransferOrderResult">
+     SELECT 
+            a.ServiceOrdID,
+            a.Old_ServiceOrdID_TXT,
+            a.ServiceOrdTraVia,
+            a.ServiceOrdNo,
+            a.ServiceOrdApptDate,
+            a.ServiceOrdUserID,
+            a.ServiceOrd_NS_ID,
+            a.ServiceOrd_NS_Time,
+            a.ServiceOrd_CC_ID,
+            a.ServiceOrd_CC_Time,
+            a.ServiceOrdAreaType,
+            a.ServiceOrdType,
+            a.ServiceOrdPtSex,
+            a.ServiceOrdTraTxnPrice,
+            a.ServiceOrdPtOutHospID,
+            a.ServiceOrdPtServicesID,
+            a.ServiceOrdPtInHospID,
+            a.ServiceOrdPtInServicesID,
+            a.ServiceOrdCoTies,
+            a.ServiceOrdCoName,
+            a.ServiceOrdTraDistance,
+            a.ServiceOrdCoPhone,
+            a.ServiceOrdClass,
+            a.ServiceOrdTraStreet,
+            a.ServiceOrdTraEnd,
+            a.ServiceOrdPtCondition,
+            b.DispatchOrd_NS_Time,
+            a.ServiceOrdState,
+            a.ServiceOrdPtIDCard,
+            b.DispatchOrdTraStreet,
+            b.DispatchOrdStartDate,
+            b.DispatchOrdTraEnd,
+            b.DispatchOrdID,
+            b.DispatchOrdCarID,
+            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
+        WHERE b.DispatchOrdID = #{dispatchId}
+     </select>
+
     
     <!-- 鏍规嵁鏈嶅姟鍗旾D鏌ヨ鐥呮儏淇℃伅 -->
     <select id="selectDiseaseIdsByServiceOrdID" resultType="String">

--
Gitblit v1.9.1