From 5f2ee03958a1a16dc27195c76ea7cffb422c95d1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期五, 19 十二月 2025 22:40:34 +0800
Subject: [PATCH] feat: 任务修改接口，删除一些不要的字段同步
---
ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml | 159 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 149 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
index 7905aa7..050beae 100644
--- a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
@@ -10,6 +10,7 @@
<result property="ServiceOrdUserID" column="ServiceOrdUserID" />
<result property="ServiceOrdAreaType" column="ServiceOrdAreaType" />
<result property="ServiceOrdType" column="ServiceOrdType" />
+ <result property="ServiceOrdNo" column="ServiceOrdNo" />
<result property="ServiceOrdTraTxnPrice" column="ServiceOrdTraTxnPrice" />
<result property="ServiceOrdPtOutHospID" column="ServiceOrdPtOutHospID" />
<result property="ServiceOrdPtServicesID" column="ServiceOrdPtServicesID" />
@@ -42,11 +43,17 @@
<result property="Old_ServiceOrdID_TXT" column="Old_ServiceOrdID_TXT" />
<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>
<!-- 鎵ц浜虹粨鏋滄槧灏� -->
<resultMap type="java.util.HashMap" id="AssigneeResult">
<result property="EntourageOAId" column="EntourageOAId" />
+ <result property="EntourageID" column="EntourageID" />
<result property="EntourageState" column="EntourageState" />
</resultMap>
@@ -55,6 +62,7 @@
SELECT
a.ServiceOrdID,
a.Old_ServiceOrdID_TXT,
+ a.ServiceOrdNo,
a.ServiceOrdTraVia,
a.ServiceOrdApptDate,
a.ServiceOrd_NS_ID,
@@ -84,16 +92,21 @@
b.DispatchOrdActualDate,
b.DispatchOrdReturnDate,
b.DispatchOrdTraEnd,
+ b.DispatchOrdState,
b.DispatchOrdID,
b.DispatchOrdCarID,
a.ServiceOrdPtServices,
a.ServiceOrdPtInServices,
- a.ServiceOrdPtName
+ a.ServiceOrdPtName,
+ b.DispatchOrdState,
+ b.DispatchOrdNo,
+ b.DispatchOrdClass,
+ a.ServiceOrdClass
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 <= 3
AND a.ServiceOrd_CC_Time > #{startDate}
- AND b.DispatchOrdState != 0
+
</select>
<!-- 鏍规嵁鏈嶅姟鍗旾D鍜岃皟搴﹀崟ID鏌ヨ杞繍鍗曟暟鎹� -->
@@ -102,9 +115,11 @@
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,
@@ -133,14 +148,116 @@
b.DispatchOrdCarID,
a.ServiceOrdPtServices,
a.ServiceOrdPtInServices,
- a.ServiceOrdPtName
+ a.ServiceOrdPtName,
+ b.DispatchOrdState,
+ b.DispatchOrdNo,
+ b.DispatchOrdClass,
+ a.ServiceOrdClass
+
FROM ServiceOrder as a
- INNER JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
- WHERE a.ServiceOrdID = #{serviceOrdID}
- AND b.DispatchOrdID = #{dispatchOrdID}
- AND a.ServiceOrdState = 3
- AND b.DispatchOrdState != 0
+ left JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
+ WHERE a.ServiceOrdID = #{serviceOrdID}
+ AND (b.DispatchOrdID = #{dispatchOrdID} OR #{dispatchOrdID} IS NULL)
+ AND a.ServiceOrdState <=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">
@@ -153,6 +270,7 @@
<select id="selectAssigneesByDispatchOrdID" resultMap="AssigneeResult">
SELECT
EntourageOAId,
+ EntourageID,
EntourageState
FROM DispatchOrd_Entourage
WHERE DispatchOrdIDDt = #{dispatchOrdID}
@@ -179,4 +297,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