From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 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 4e1af03..b9040d7 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -22,9 +22,15 @@
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
- IFNULL(jda.address_name,jp.location)address_name ,
+ IFNULL( jda.address_name, jp.location ) AS address_name,
+ jgr.district_code aoiCode,
+ jda.region_code,
+ jg.community_code neiCode,
+ jc.street_code streetCode,
+ bu.name realName,
+ bu.phone,
jt.id,
- jt.name,
+ jt.NAME,
jt.type,
jt.frequency,
jt.remark,
@@ -32,29 +38,61 @@
jt.create_user,
jt.update_time,
jt.update_user,
- jt.status,
+ jt.STATUS,
jt.tenant_id,
jt.create_dept,
jt.is_deleted,
jt.house_code,
jt.report_type
FROM
- jczz_gridman jgm
- LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
- LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
- LEFT JOIN jczz_task jt ON jgr.house_code = jt.house_code
+ jczz_task jt
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
- LEFT JOIN jczz_place jp on jp.house_code=jgr.house_code
+ LEFT JOIN jczz_place jp ON jp.house_code = jt.house_code
+ LEFT JOIN blade_user bu on bu.id = jt.create_user
+ LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+ LEFT JOIN jczz_community jc on jc.`code`= jg.community_code
<where>
<if test="task.userId != null and task.userId != ''">
- and jgm.user_id = #{task.userId}
+ AND jt.house_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
+ jg.is_deleted = 0
+ <if test="task.communityCode != null and task.communityCode != ''">
+ and jg.community_code = #{task.communityCode}
+ </if>
+ AND jgm.user_id = #{task.userId} )
</if>
- <if test="task.communityCode != null and task.communityCode != ''">
- and jg.community_code = #{task.communityCode}
- </if>
+
<if test="task.status != null and task.status != null">
and jt.status = #{task.status}
</if>
+
+ <if test="task.aoiCode != null and task.aoiCode != null">
+ and jgr.district_code = #{task.aoiCode}
+ </if>
+
+ <if test="task.neiCode != null and task.neiCode != null">
+ and jg.community_code = #{task.neiCode}
+ </if>
+
+ <if test="task.streetCode != null and task.streetCode != null">
+ and jc.street_code = #{task.streetCode}
+ </if>
+
+ <if test="task.realName != null and task.realName != null">
+ and bu.name = like concat('%', #{task.realName}, '%')
+ </if>
+
+ <if test="task.phone != null and task.phone != null">
+ and bu.phone = like concat('%', #{task.phone}, '%')
+ </if>
+
<if test="task.frequency != null and task.frequency != ''">
and jt.frequency = #{task.frequency}
</if>
@@ -86,6 +124,8 @@
<if test="task.reportType == null">
and jt.report_type in (2,3,4,5,6)
</if>
+ and jt.is_deleted = 0
+ and jt.house_code is not null
order by jt.create_time desc
</where>
</select>
--
Gitblit v1.9.3