Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-02-04 fc7ee73b5f804116ada59048fdf6fb9265856a3f

 ard-route/src/main/resources/mapper/ArdRouteMissionMapper.xml

@@ -16,6 +16,7 @@
        <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">
@@ -29,7 +30,8 @@
               update_time,
               execute_by,
               execute_time,
               task_type
               task_type,
               task_description
        from ard_route_mission
    </sql>

@@ -43,13 +45,13 @@
            <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">
@@ -66,6 +68,7 @@
            <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>
@@ -79,6 +82,7 @@
            <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>

@@ -95,6 +99,7 @@
            <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>