From a8553f9ef7e165b6348243af91caad1a987f8f9c Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 03 九月 2025 17:49:52 +0800
Subject: [PATCH] fix: 修复轨迹查询报错问题。 更换了接口地址和增加请求参数

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

diff --git a/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml
index e11e5b3..c59df7d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml
@@ -42,10 +42,12 @@
         <result property="ServiceOrdNo"    column="ServiceOrdNo"    />
         <result property="CreateTime"    column="CreateTime"    />
         <result property="UpdateTime"    column="UpdateTime"    />
+        <result property="OrderStatus"    column="OrderStatus"    />
+        <result property="AppId"    column="AppId"    />
     </resultMap>
 
     <sql id="selectTbOrdersVo">
-        select OrderID, LinkPerson, LinkTel, AlarmTel, PatientName, Sex, Age, Kg, Sense, LocalAddress, LocalLongitude, LocalLatitude, LocalProvince, LocalCity, LocalDistrict, SendAddress, SendLongitude, SendLatitude, SendProvince, SendCity, SendDistrict, BookingPrice, BookingDate, Remark, Complaint, PatientCount, BookingKM, EscortCode, LiftingCode, LiftingFloor, RequirementCode, TypeCode, ThirdPartyResult, ServiceOrdID, ServiceOrdNo, CreateTime, UpdateTime from tb_orders
+        select OrderID, LinkPerson, LinkTel, AlarmTel, PatientName, Sex, Age, Kg, Sense, LocalAddress, LocalLongitude, LocalLatitude, LocalProvince, LocalCity, LocalDistrict, SendAddress, SendLongitude, SendLatitude, SendProvince, SendCity, SendDistrict, BookingPrice, BookingDate, Remark, Complaint, PatientCount, BookingKM, EscortCode, LiftingCode, LiftingFloor, RequirementCode, TypeCode, ThirdPartyResult, ServiceOrdID, ServiceOrdNo, CreateTime, UpdateTime, OrderStatus, AppId from tb_orders
     </sql>
 
     <select id="selectTbOrdersList" parameterType="TbOrders" resultMap="TbOrdersResult">
@@ -87,12 +89,16 @@
             <if test="ServiceOrdNo != null  and ServiceOrdNo != ''"> and ServiceOrdNo = #{ServiceOrdNo}</if>
             <if test="CreateTime != null "> and CreateTime = #{CreateTime}</if>
             <if test="UpdateTime != null "> and UpdateTime = #{UpdateTime}</if>
+            <if test="OrderStatus != null "> and OrderStatus = #{OrderStatus}</if>
+            <if test="AppId != null  and AppId != ''"> and AppId = #{AppId}</if>
         </where>
+        ORDER BY CreateTime DESC
     </select>
     
     <select id="selectTbOrdersByOrderID" parameterType="Long" resultMap="TbOrdersResult">
         <include refid="selectTbOrdersVo"/>
         where OrderID = #{OrderID}
+        ORDER BY CreateTime DESC
     </select>
 
     <insert id="insertTbOrders" parameterType="TbOrders">
@@ -135,6 +141,8 @@
             <if test="ServiceOrdNo != null">ServiceOrdNo,</if>
             <if test="CreateTime != null">CreateTime,</if>
             <if test="UpdateTime != null">UpdateTime,</if>
+            <if test="OrderStatus != null">OrderStatus,</if>
+            <if test="AppId != null">AppId,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="OrderID != null">#{OrderID},</if>
@@ -174,6 +182,8 @@
             <if test="ServiceOrdNo != null">#{ServiceOrdNo},</if>
             <if test="CreateTime != null">#{CreateTime},</if>
             <if test="UpdateTime != null">#{UpdateTime},</if>
+            <if test="OrderStatus != null">#{OrderStatus},</if>
+            <if test="AppId != null">#{AppId},</if>
          </trim>
     </insert>
 
@@ -216,6 +226,8 @@
             <if test="ServiceOrdNo != null">ServiceOrdNo = #{ServiceOrdNo},</if>
             <if test="CreateTime != null">CreateTime = #{CreateTime},</if>
             <if test="UpdateTime != null">UpdateTime = #{UpdateTime},</if>
+            <if test="OrderStatus != null">OrderStatus = #{OrderStatus},</if>
+            <if test="AppId != null">AppId = #{AppId},</if>
         </trim>
         where OrderID = #{OrderID}
     </update>
@@ -230,4 +242,15 @@
             #{OrderID}
         </foreach>
     </delete>
+
+    <select id="checkServiceOrdIDExists" parameterType="String" resultType="Integer">
+        select count(1) from tb_orders where ServiceOrdID = #{ServiceOrdID}
+    </select>
+
+    <select id="selectTbOrdersByServiceOrdID" parameterType="String" resultMap="TbOrdersResult">
+        <include refid="selectTbOrdersVo"/>
+        where ServiceOrdID = #{ServiceOrdID}
+        LIMIT 1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1