From f5c900c58513bad824381e69750ac7667ef35de0 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 26 二月 2026 22:29:46 +0800
Subject: [PATCH] feat: 修改增另任务单查询，使用单号查询
---
ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml | 142 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 142 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 99faf07..fb24bf8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysTaskMapper.xml
@@ -78,6 +78,56 @@
left join sys_task_vehicle tv on t.task_id = tv.task_id
left join tb_vehicle_info v on tv.vehicle_id = v.vehicle_id
</sql>
+
+ <sql id="selectSysTaskVoWithEmergency">
+ select t.task_id, t.task_code, t.task_type, t.task_status, t.task_description,
+ 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, t.legacy_synced,
+ u1.nick_name as creator_name, u2.nick_name as assignee_name, d.dept_name,
+ (
+ select v2.vehicle_no
+ from sys_task_vehicle tv2
+ left join tb_vehicle_info v2 on tv2.vehicle_id = v2.vehicle_id
+ where tv2.task_id = t.task_id
+ order by tv2.assign_time asc
+ limit 1
+ ) as vehicle_no,
+ tv.id as tv_id, tv.task_id as tv_task_id, tv.vehicle_id as tv_vehicle_id,
+ v.vehicle_no as tv_vehicle_no, v.vehicle_type as tv_vehicle_type,
+ v.vehicle_brand as tv_vehicle_brand, v.vehicle_model as tv_vehicle_model,
+ tv.assign_time as tv_assign_time, tv.assign_by as tv_assign_by,
+ tv.status as tv_status, tv.remark as tv_remark,
+ CASE
+ WHEN e.legacy_dispatch_ord_class IS NOT NULL
+ AND e.legacy_dispatch_ns_time IS NOT NULL
+ AND e.legacy_dispatch_ord_no IS NOT NULL
+ THEN CONCAT(e.legacy_dispatch_ord_class,
+ DATE_FORMAT(e.legacy_dispatch_ns_time, '%Y%m%d'),
+ '-',
+ LPAD(CAST(e.legacy_dispatch_ord_no AS CHAR), 3, '0'))
+ ELSE NULL
+ END AS dispatch_code,
+ CASE
+ WHEN e.legacy_service_ord_class IS NOT NULL
+ AND e.legacy_service_ns_time IS NOT NULL
+ AND e.legacy_service_ord_no IS NOT NULL
+ THEN CONCAT(e.legacy_service_ord_class,
+ DATE_FORMAT(e.legacy_service_ns_time, '%Y%m%d'),
+ '-',
+ LPAD(CAST(e.legacy_service_ord_no AS CHAR), 3, '0'))
+ ELSE NULL
+ END AS service_code
+ from sys_task t
+ left join sys_user u1 on t.creator_id = u1.user_id
+ left join sys_user u2 on t.assignee_id = u2.user_id
+ left join sys_dept d on t.dept_id = d.dept_id
+ left join sys_task_vehicle tv on t.task_id = tv.task_id
+ left join tb_vehicle_info v on tv.vehicle_id = v.vehicle_id
+ left join sys_task_emergency e on t.task_id = e.task_id
+ </sql>
<select id="selectSysTaskList" parameterType="TaskQueryVO" resultMap="SysTaskResult">
<include refid="selectSysTaskVo"/>
@@ -383,4 +433,96 @@
)
order by t.actual_start_time, t.planned_start_time
</select>
+
+ <!-- 浼樺寲鐨勫鐮佹煡璇㈡柟娉曪紝鍏宠仈sys_task_emergency琛� -->
+ <select id="selectSysTaskListByMultiCodeOptimized" parameterType="TaskQueryVO" resultMap="SysTaskResult">
+ <include refid="selectSysTaskVoWithEmergency"/>
+ <where>
+ t.del_flag = '0'
+ <if test="taskCode != null and taskCode != ''">
+ and (
+ t.task_code like concat('%', #{taskCode}, '%')
+ or CASE
+ WHEN e.legacy_dispatch_ord_class IS NOT NULL
+ AND e.legacy_dispatch_ns_time IS NOT NULL
+ AND e.legacy_dispatch_ord_no IS NOT NULL
+ THEN CONCAT(e.legacy_dispatch_ord_class,
+ DATE_FORMAT(e.legacy_dispatch_ns_time, '%Y%m%d'),
+ '-',
+ LPAD(CAST(e.legacy_dispatch_ord_no AS CHAR), 3, '0'))
+ ELSE NULL
+ END like concat('%', #{taskCode}, '%')
+ or CASE
+ WHEN e.legacy_service_ord_class IS NOT NULL
+ AND e.legacy_service_ns_time IS NOT NULL
+ AND e.legacy_service_ord_no IS NOT NULL
+ THEN CONCAT(e.legacy_service_ord_class,
+ DATE_FORMAT(e.legacy_service_ns_time, '%Y%m%d'),
+ '-',
+ LPAD(CAST(e.legacy_service_ord_no AS CHAR), 3, '0'))
+ ELSE NULL
+ END like concat('%', #{taskCode}, '%')
+ )
+ </if>
+ <if test="taskType != null and taskType != ''"> and t.task_type = #{taskType}</if>
+ <if test="taskStatus != null and taskStatus != ''"> and t.task_status = #{taskStatus}</if>
+ <if test="taskStatusList != null and taskStatusList != ''"> and t.task_status in
+ <foreach collection="taskStatusList.split(',')" item="status" open="(" separator="," close=")">
+ #{status}
+ </foreach>
+ </if>
+ <if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no like concat('%', #{vehicleNo}, '%')</if>
+ <!-- 缁煎悎鏌ヨ锛氬綋鍓嶇敤鎴锋墍鍦ㄦ満鏋� OR 褰撳墠鐢ㄦ埛鍒涘缓 OR 鍒嗛厤缁欏綋鍓嶇敤鎴� -->
+ <if test="(creatorId != null and creatorId != 0) or (assigneeId != null and assigneeId != 0) or (deptId != null and deptId != 0) or (deptIds != null and deptIds.size() > 0)">
+ and (
+ <!-- 鏌ヨ鎸囧畾鍒嗗叕鍙稿強鍏舵墍鏈夊瓙閮ㄩ棬鐨勪换鍔� -->
+ <if test="deptId != null and deptId != 0">
+ (t.dept_id = #{deptId} OR t.dept_id IN (
+ SELECT dept_id FROM sys_dept
+ WHERE del_flag = '0' AND find_in_set(#{deptId}, ancestors)
+ ))
+ </if>
+ <!-- 鏌ヨ澶氫釜鍒嗗叕鍙稿強鍏舵墍鏈夊瓙閮ㄩ棬鐨勪换鍔� -->
+ <if test="deptIds != null and deptIds.size() > 0">
+ <if test="deptId != null and deptId != 0"> or </if>
+ (
+ <foreach collection="deptIds" item="branchDeptId" separator=" OR ">
+ (t.dept_id = #{branchDeptId} OR t.dept_id IN (
+ SELECT dept_id FROM sys_dept
+ WHERE del_flag = '0' AND find_in_set(#{branchDeptId}, ancestors)
+ ))
+ </foreach>
+ )
+ </if>
+ <if test="creatorId != null and creatorId != 0">
+ <if test="(deptId != null and deptId != 0) or (deptIds != null and deptIds.size() > 0)"> or </if>
+ t.creator_id = #{creatorId}
+ </if>
+ <if test="assigneeId != null and assigneeId != 0">
+ <if test="(deptId != null and deptId != 0) or (deptIds != null and deptIds.size() > 0) or (creatorId != null and creatorId != 0)"> or </if>
+ t.task_id IN (
+ SELECT task_id FROM sys_task_assignee WHERE user_id = #{assigneeId}
+ )
+ </if>
+ )
+ </if>
+ <if test="plannedStartTimeBegin != null "> and t.planned_start_time >= #{plannedStartTimeBegin}</if>
+ <if test="plannedStartTimeEnd != null "> and t.planned_start_time <= #{plannedStartTimeEnd}</if>
+ <if test="plannedEndTimeBegin != null "> and t.planned_end_time >= #{plannedEndTimeBegin}</if>
+ <if test="plannedEndTimeEnd != null "> and t.planned_end_time <= #{plannedEndTimeEnd}</if>
+ <if test="overdue != null and overdue == true"> and t.planned_end_time < now() and t.task_status != 'COMPLETED'</if>
+ </where>
+ order by
+ CASE t.task_status
+ WHEN 'PENDING' THEN 1
+ WHEN 'DEPARTING' THEN 2
+ WHEN 'ARRIVED' THEN 3
+ WHEN 'RETURNING' THEN 4
+ WHEN 'IN_PROGRESS' THEN 5
+ WHEN 'COMPLETED' THEN 6
+ WHEN 'CANCELLED' THEN 7
+ ELSE 8
+ END,
+ t.create_time desc
+ </select>
</mapper>
--
Gitblit v1.9.1