From fc7ee73b5f804116ada59048fdf6fb9265856a3f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 04 Feb 2026 09:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/resources/mapper/ArdRouteMissionMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteMissionMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteMissionMapper.xml
index 9c71e07..895f203 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteMissionMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteMissionMapper.xml
@@ -15,6 +15,8 @@
<result property="updateTime" column="update_time" />
<result property="executeBy" column="execute_by" />
<result property="executeTime" column="execute_time" />
+ <result property="taskType" column="task_type" />
+ <result property="taskDescription" column="task_description" />
</resultMap>
<sql id="selectArdRouteMissionVo">
@@ -27,7 +29,9 @@
update_by,
update_time,
execute_by,
- execute_time
+ execute_time,
+ task_type,
+ task_description
from ard_route_mission
</sql>
@@ -39,14 +43,15 @@
<if test="executeStatus != null and executeStatus != ''"> and execute_status = #{executeStatus}</if>
<if test="executeBy != null and executeBy != ''"> and execute_by = #{executeBy}</if>
<if test="executeTime != null "> and execute_time = #{executeTime}</if>
+ <if test="taskType != null and taskType != ''"> and task_type = #{taskType}</if>
</where>
- order by create_time asc
+ order by create_time DESC
</select>
<select id="selectArdRouteMissionById" parameterType="String" resultMap="ArdRouteMissionResult">
<include refid="selectArdRouteMissionVo"/>
where id = #{id}
- order by create_time asc
+ order by create_time DESC
</select>
<insert id="insertArdRouteMission" parameterType="ArdRouteMission">
@@ -62,6 +67,8 @@
<if test="updateTime != null">update_time,</if>
<if test="executeBy != null">execute_by,</if>
<if test="executeTime != null">execute_time,</if>
+ <if test="taskType != null">task_type,</if>
+ <if test="taskDescription != null">task_description,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -74,6 +81,8 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="executeBy != null">#{executeBy},</if>
<if test="executeTime != null">#{executeTime},</if>
+ <if test="taskType != null">#{taskType},</if>
+ <if test="taskDescription != null">#{taskDescription},</if>
</trim>
</insert>
@@ -89,6 +98,8 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="executeBy != null">execute_by = #{executeBy},</if>
<if test="executeTime != null">execute_time = #{executeTime},</if>
+ <if test="taskType != null">task_type = #{taskType},</if>
+ <if test="taskDescription != null">task_description = #{taskDescription},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3