From 7a1e4d9fe3fe2172d5c4fba524f17ffd73ffbb3e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 08 Jul 2024 10:39:26 +0800
Subject: [PATCH] 公安添加时间过滤
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 008a099..be111d3 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -29,8 +29,9 @@
br.town_code streetCode,
jp.principal as realName,
jp.principal_phone as phone,
- jp.nine_type ,
- jp.front_type ,
+ jp.nine_type,
+ jp.front_type,
+ jp.place_name,
jt.id,
jt.NAME,
jt.type,
@@ -60,7 +61,8 @@
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
and jh.grid_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
#{code}
</foreach>
</when>
@@ -73,7 +75,8 @@
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
and br.village_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
#{code}
</foreach>
</when>
@@ -419,7 +422,6 @@
and jt.report_type in (5,8)
</if>
and jt.is_deleted = 0
- and jt.house_code is not null
</where>
</select>
@@ -441,6 +443,10 @@
AND jt.report_type = #{task.reportType}
</if>
+ <if test="task.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
+ AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
+ </if>
+
<if test="task.reportType == null or task.reportType == ''">
AND jt.report_type in (2,3,6,7)
</if>
--
Gitblit v1.9.3