From 6831e7b977681e3f6a1c619e13c2fe28e7ccc49d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 02 七月 2025 10:36:31 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml
index fc4a53e..5465914 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml
@@ -62,10 +62,13 @@
</select>
<select id="pageListUser" resultType="com.ruoyi.system.applet.vo.TaskUserListVO">
select t1.*,t2.location_name as locationName,t3.location_name as locationTypeName,
+ t2.location_address as locationAddress,
+ t2.location_address_end as locationAddressEnd,
t3.location_icon as locatioTypeIcon,
t5.clear_status as clearStatus,
t4.nick_name as patrolInspectorName,
t4.phonenumber as phonenumber,
+
ROUND(
6378.138 * 2 * ASIN(
SQRT(
@@ -91,23 +94,24 @@
left join t_location t2 on t1.location_id = t2.id
left join t_location_type t3 on t2.location_type = t3.id
left join sys_user t4 on t1.patrol_inspector = t4.user_id
- LEFT JOIN (SELECT t1.*
+ LEFT JOIN (
+ SELECT t1.*
FROM t_task_detail t1
- JOIN (
- SELECT task_id, MAX(create_time) AS max_time
+ JOIN (SELECT task_id, MAX(create_time) AS max_time
FROM t_task_detail
- GROUP BY task_id
- ) AS t2 ON t1.task_id = t2.task_id AND t1.create_time = t2.max_time
+ GROUP BY task_id) AS t2 ON t1.task_id = t2.task_id AND t1.create_time = t2.max_time
+ where 1=1
+ <if test="query.clearStatus != null">
+ and t1.clear_status = #{query.clearStatus}
+ </if>
) t5 on t1.id = t5.task_id
where 1=1
and t1.`disabled` = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
- <if test="query.clearStatus != null">
- and t2.status = #{query.clearStatus}
- </if>
+
<if test="query.userId != null and query.userId != ''">
and t1.patrol_inspector = #{query.userId}
</if>
- <if test="query.startTime != null and startTime != ''">
+ <if test="query.startTime != null and query.startTime != ''">
and (t1.implement_time between #{query.startTime} and #{query.endTime})
</if>
</select>
--
Gitblit v1.7.1