From d4fe921568bc29d72644a55fd194adf7f9277cb5 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 22 十一月 2025 15:28:35 +0800
Subject: [PATCH] feat: 将旧系统数据同步到新系统

---
 ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml
index 9a21d7b..ebc0e2d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml
@@ -186,6 +186,10 @@
             <if test="creatorId != null">creator_id,</if>
             <if test="assigneeId != null">assignee_id,</if>
             <if test="deptId != null">dept_id,</if>
+            <if test="plannedStartTime!=null">planned_start_time,</if>
+            <if test="plannedEndTime!=null">planned_end_time,</if>
+            <if test="plannedStartTime!=null">planned_start_time,</if>
+            <if test="plannedEndTime!=null">planned_end_time,</if>
             <if test="createTime != null">create_time,</if>
             update_time,
             <if test="createBy != null">create_by,</if>
@@ -212,6 +216,10 @@
             <if test="creatorId != null">#{creatorId},</if>
             <if test="assigneeId != null">#{assigneeId},</if>
             <if test="deptId != null">#{deptId},</if>
+            <if test="plannedStartTime!=null">#{plannedStartTime},</if>
+            <if test="plannedEndTime!=null">#{plannedEndTime},</if>
+            <if test="actualStartTime!=null">#{actualStartTime},</if>
+            <if test="actualEndTime!=null">#{actualEndTime},</if>
             <if test="createTime != null">#{createTime},</if>
             now(),
             <if test="createBy != null">#{createBy},</if>
@@ -268,6 +276,19 @@
         where task_id = #{taskId}
     </update>
 
+    <select id="selectActiveTasksByVehicleId" parameterType="Long" resultMap="SysTaskResult">
+        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.actual_start_time,
+               t.create_time, t.update_time
+        from sys_task t
+        inner join sys_task_vehicle tv on t.task_id = tv.task_id
+        where tv.vehicle_id = #{vehicleId}
+          and t.del_flag = '0'
+          and t.task_status not in ('PENDING', 'COMPLETED', 'CANCELLED')
+        order by t.create_time desc
+    </select>
+
     <delete id="deleteSysTaskByTaskId" parameterType="Long">
         update sys_task set del_flag = '2', update_time = now() where task_id = #{taskId}
     </delete>

--
Gitblit v1.9.1