966120
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wlzboy
2025-09-24 62a079a15b46925283581f6caaf631b5a4558927 
 ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml


@@ -12,6 +12,11 @@


        <result property="taskDescription"  column="task_description"  />


        <result property="departureAddress" column="departure_address" />


        <result property="destinationAddress" column="destination_address" />


        <result property="departureLongitude" column="departure_longitude" />


        <result property="departureLatitude" column="departure_latitude" />


        <result property="destinationLongitude" column="destination_longitude" />


        <result property="destinationLatitude" column="destination_latitude" />


        <result property="estimatedDistance" column="estimated_distance" />


        <result property="plannedStartTime" column="planned_start_time" />


        <result property="plannedEndTime"   column="planned_end_time"  />


        <result property="actualStartTime"  column="actual_start_time" />


@@ -32,7 +37,9 @@




    <sql id="selectSysTaskVo">


        select t.task_id, t.task_code, t.task_type, t.task_status, t.task_description, 


               t.departure_address, t.destination_address, t.planned_start_time, t.planned_end_time,


               t.departure_address, t.destination_address, t.departure_longitude, t.departure_latitude,


               t.destination_longitude, t.destination_latitude, t.estimated_distance,


               t.planned_start_time, t.planned_end_time,


               t.actual_start_time, t.actual_end_time, t.creator_id, t.assignee_id, t.dept_id,


               t.create_time, t.update_time, t.create_by, t.update_by, t.remark, t.del_flag,


               u1.nick_name as creator_name, u2.nick_name as assignee_name, d.dept_name


@@ -71,6 +78,12 @@


        where t.task_code = #{taskCode} and t.del_flag = '0'


    </select>




    <select id="selectMaxTaskCodeByDatePrefix" parameterType="String" resultType="String">


        select max(task_code) 


        from sys_task 


        where task_code like concat(#{datePrefix}, '%') and del_flag = '0'


    </select>




    <select id="selectOverdueTasks" resultMap="SysTaskResult">


        <include refid="selectSysTaskVo"/>


        where t.del_flag = '0' and t.planned_end_time &lt; now() and t.task_status != 'COMPLETED'


@@ -106,6 +119,11 @@


            <if test="taskDescription != null">task_description,</if>


            <if test="departureAddress != null">departure_address,</if>


            <if test="destinationAddress != null">destination_address,</if>


            <if test="departureLongitude != null">departure_longitude,</if>


            <if test="departureLatitude != null">departure_latitude,</if>


            <if test="destinationLongitude != null">destination_longitude,</if>


            <if test="destinationLatitude != null">destination_latitude,</if>


            <if test="estimatedDistance != null">estimated_distance,</if>


            <if test="plannedStartTime != null">planned_start_time,</if>


            <if test="plannedEndTime != null">planned_end_time,</if>


            <if test="actualStartTime != null">actual_start_time,</if>


@@ -114,7 +132,7 @@


            <if test="assigneeId != null">assignee_id,</if>


            <if test="deptId != null">dept_id,</if>


            <if test="createTime != null">create_time,</if>


            <if test="updateTime != null">update_time,</if>


            update_time,


            <if test="createBy != null">create_by,</if>


            <if test="updateBy != null">update_by,</if>


            <if test="remark != null">remark,</if>


@@ -127,6 +145,11 @@


            <if test="taskDescription != null">#{taskDescription},</if>


            <if test="departureAddress != null">#{departureAddress},</if>


            <if test="destinationAddress != null">#{destinationAddress},</if>


            <if test="departureLongitude != null">#{departureLongitude},</if>


            <if test="departureLatitude != null">#{departureLatitude},</if>


            <if test="destinationLongitude != null">#{destinationLongitude},</if>


            <if test="destinationLatitude != null">#{destinationLatitude},</if>


            <if test="estimatedDistance != null">#{estimatedDistance},</if>


            <if test="plannedStartTime != null">#{plannedStartTime},</if>


            <if test="plannedEndTime != null">#{plannedEndTime},</if>


            <if test="actualStartTime != null">#{actualStartTime},</if>


@@ -135,7 +158,7 @@


            <if test="assigneeId != null">#{assigneeId},</if>


            <if test="deptId != null">#{deptId},</if>


            <if test="createTime != null">#{createTime},</if>


            <if test="updateTime != null">#{updateTime},</if>


            now(),


            <if test="createBy != null">#{createBy},</if>


            <if test="updateBy != null">#{updateBy},</if>


            <if test="remark != null">#{remark},</if>


@@ -152,6 +175,11 @@


            <if test="taskDescription != null">task_description = #{taskDescription},</if>


            <if test="departureAddress != null">departure_address = #{departureAddress},</if>


            <if test="destinationAddress != null">destination_address = #{destinationAddress},</if>


            <if test="departureLongitude != null">departure_longitude = #{departureLongitude},</if>


            <if test="departureLatitude != null">departure_latitude = #{departureLatitude},</if>


            <if test="destinationLongitude != null">destination_longitude = #{destinationLongitude},</if>


            <if test="destinationLatitude != null">destination_latitude = #{destinationLatitude},</if>


            <if test="estimatedDistance != null">estimated_distance = #{estimatedDistance},</if>


            <if test="plannedStartTime != null">planned_start_time = #{plannedStartTime},</if>


            <if test="plannedEndTime != null">planned_end_time = #{plannedEndTime},</if>


            <if test="actualStartTime != null">actual_start_time = #{actualStartTime},</if>


@@ -172,7 +200,7 @@


            task_status = #{taskStatus},


            <if test="actualStartTime != null">actual_start_time = #{actualStartTime},</if>


            <if test="actualEndTime != null">actual_end_time = #{actualEndTime},</if>


            update_time = now(),


            update_time = #{updateTime},


            update_by = #{updateBy}


        where task_id = #{taskId}


    </update>


@@ -180,17 +208,17 @@


    <update id="assignTask" parameterType="SysTask">


        update sys_task set 


            assignee_id = #{assigneeId},


            update_time = now(),


            update_time = #{updateTime},


            update_by = #{updateBy}


        where task_id = #{taskId}


    </update>




    <delete id="deleteSysTaskByTaskId" parameterType="Long">


        update sys_task set del_flag = '2' where task_id = #{taskId}


        update sys_task set del_flag = '2', update_time = now() where task_id = #{taskId}


    </delete>




    <delete id="deleteSysTaskByTaskIds" parameterType="String">


        update sys_task set del_flag = '2' where task_id in 


        update sys_task set del_flag = '2', update_time = now() where task_id in 


        <foreach item="taskId" collection="array" open="(" separator="," close=")">


            #{taskId}


        </foreach>