From 847a7773ef1a8ad418c6934d35b5f205a97c04d0 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 06 十二月 2025 17:03:24 +0800
Subject: [PATCH] fix:在任务状态更新时，需要更新日志到旧系统

---
 ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
index f3aad10..906b028 100644
--- a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
@@ -43,11 +43,13 @@
         <result property="Old_ServiceOrdID_TXT" column="Old_ServiceOrdID_TXT" />
         <result property="ServiceOrdTraDistance" column="ServiceOrdTraDistance" />
         <result property="ServiceOrdApptDate" column="ServiceOrdApptDate" />
+        <result property="DispatchOrdState" column="DispatchOrdState" />
     </resultMap>
     
     <!-- 鎵ц浜虹粨鏋滄槧灏� -->
     <resultMap type="java.util.HashMap" id="AssigneeResult">
         <result property="EntourageOAId" column="EntourageOAId" />
+        <result property="EntourageID" column="EntourageID" />
         <result property="EntourageState" column="EntourageState" />
     </resultMap>
     
@@ -86,16 +88,17 @@
             b.DispatchOrdActualDate,
             b.DispatchOrdReturnDate,
             b.DispatchOrdTraEnd,
+            b.DispatchOrdState,
             b.DispatchOrdID,
             b.DispatchOrdCarID,
             a.ServiceOrdPtServices,
             a.ServiceOrdPtInServices,
             a.ServiceOrdPtName
         FROM ServiceOrder as a 
-        INNER JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
-        WHERE a.ServiceOrdState = 3 
+        left JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
+        WHERE a.ServiceOrdState &lt;= 3
             AND a.ServiceOrd_CC_Time > #{startDate} 
-            AND b.DispatchOrdState != 0
+            
     </select>
     
     <!-- 鏍规嵁鏈嶅姟鍗旾D鍜岃皟搴﹀崟ID鏌ヨ杞繍鍗曟暟鎹� -->
@@ -136,13 +139,13 @@
             b.DispatchOrdCarID,
             a.ServiceOrdPtServices,
             a.ServiceOrdPtInServices,
-            a.ServiceOrdPtName
+            a.ServiceOrdPtName,
+            b.DispatchOrdState
         FROM ServiceOrder as a 
-        INNER JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
+        left JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
         WHERE a.ServiceOrdID = #{serviceOrdID}
-            AND b.DispatchOrdID = #{dispatchOrdID}
-            AND a.ServiceOrdState = 3 
-            AND b.DispatchOrdState != 0
+            AND a.ServiceOrdState &lt;=3
+
     </select>
     
     <!-- 鏍规嵁鏈嶅姟鍗旾D鏌ヨ鐥呮儏淇℃伅 -->
@@ -156,6 +159,7 @@
     <select id="selectAssigneesByDispatchOrdID" resultMap="AssigneeResult">
         SELECT 
             EntourageOAId,
+            EntourageID,
             EntourageState
         FROM DispatchOrd_Entourage 
         WHERE DispatchOrdIDDt = #{dispatchOrdID}
@@ -182,4 +186,25 @@
         WHERE vID = #{deptID} AND vtitle = 'HospitalDepartment'
     </select>
     
+    <!-- 鎻掑叆璋冨害鍗曠姸鎬佸彉鏇磋褰曞埌 DispatchOrd_Running 琛� -->
+    <insert id="insertDispatchOrdRunning">
+        INSERT INTO DispatchOrd_Running (
+            DispatchOrdIDDt,
+            DispatchOrdState,
+            DispatchOrdStartDate,
+            DispatchOrdStartOA
+            <if test="oaLatitude != null">,OA_latitude</if>
+            <if test="oaLongitude != null">,OA_longitude</if>
+            <if test="oaAddress != null and oaAddress != ''">,OA_address</if>
+        ) VALUES (
+            #{dispatchOrdID},
+            #{dispatchOrdState},
+            #{dispatchOrdStartDate},
+            #{dispatchOrdStartOA}
+            <if test="oaLatitude != null">,#{oaLatitude}</if>
+            <if test="oaLongitude != null">,#{oaLongitude}</if>
+            <if test="oaAddress != null and oaAddress != ''">,#{oaAddress}</if>
+        )
+    </insert>
+    
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1