From ca93fe7eb03bec91d5cb9f45ebb3b6c98819b7ff Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Dec 2023 18:01:09 +0800
Subject: [PATCH] 我的任务，里面审核搜索加上时间条件
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index b5da0f1..1145a76 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -46,6 +46,9 @@
<if test="vo.viewType != null">
AND jtrfr.view_type = #{vo.viewType}
</if>
+ <if test="vo.startTime != null and vo.startTime != '' and vo.endTime != null and vo.endTime != '' ">
+ AND jtrfr.create_time BETWEEN #{vo.startTime} and #{vo.endTime}
+ </if>
<if test="vo.roleName!=null and vo.roleName!=''">
<if test="vo.roleName=='网格员'">
<choose>
@@ -74,7 +77,6 @@
LEFT JOIN jczz_doorplate_address jda ON jtrfr.address_code = jda.address_code
WHERE
jda.nei_code = #{code}
- AND jda.unit_code IS NOT NULL
AND jtrfr.is_deleted = 0
<if test="status != null">
and jtrfr.confirm_flag = #{status}
@@ -83,20 +85,29 @@
and jtrfr.type = #{type}
</if>
- <if test="userId != null">
- AND EXISTS (
- SELECT
- *
+ <if test="userId != null and roleType == '1'">
+ AND jda.address_code IN (
+ SELECT DISTINCT
+ jgr.house_code
FROM
jczz_grid jg
LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
WHERE
jgm.user_id = #{userId}
- AND jtrfr.address_code = jgr.house_code
AND jg.is_deleted = 0
)
</if>
+ <if test="userId != null and roleType == '3'">
+ AND jda.address_code IN (SELECT
+ jda.address_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
+ )
+ </if>
</select>
--
Gitblit v1.9.3