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 | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 fa0d197..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>
@@ -439,6 +441,10 @@
<where>
<if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
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 == ''">
@@ -466,7 +472,7 @@
<!--取保候审人员查询-->
<select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
SELECT
- IFNULL( jda.address_name, jp.location ) AS address_name,
+ IFNULL( jda.address_name, jh.house_name ) AS address_name,
jtbre.apply_name,
jh.district_code aoiCode,
jda.region_code,
@@ -522,7 +528,7 @@
</if>
<if test="task.aoiCode != null and task.aoiCode != null">
- and jgr.district_code = #{task.aoiCode}
+ and jh.district_code = #{task.aoiCode}
</if>
<if test="task.neiCode != null and task.neiCode != null">
--
Gitblit v1.9.3