From 310633feef20e9b77d44fd25e0b41778e033b33b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 11 十一月 2025 21:48:46 +0800
Subject: [PATCH] feat: 车辆GPS统计，并修改了一些变更任务状态的逻辑
---
ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 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 d4f0640..c59df7d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml
@@ -43,10 +43,11 @@
<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, OrderStatus 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">
@@ -89,12 +90,15 @@
<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">
@@ -138,6 +142,7 @@
<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>
@@ -178,6 +183,7 @@
<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>
@@ -221,6 +227,7 @@
<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>
@@ -235,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