From 9d49dba3ba467a04b9ba9511b82b4d7fa8b402ed Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 13:30:41 +0800
Subject: [PATCH] 民警角色驾驶舱
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index c43736a..a0eeef3 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -147,6 +147,12 @@
<if test="house.districtName != null and house.districtName != ''">
and jh.district_name like concat('%',#{house.districtName},'%')
</if>
+ <if test="house.townStreetName!=null and house.townStreetName!=''">
+ and jda.town_street_name like concat('%',#{house.townStreetName},'%')
+ </if>
+ <if test="house.neiName!=null and house.neiName!=''">
+ and jda.nei_name like concat('%',#{house.neiName},'%')
+ </if>
<if test="house.houseName != null and house.houseName != ''"> and jh.house_name like concat('%',#{house.houseName},'%')</if>
<if test="house.phone != null and house.phone != ''"> and jh.phone = #{house.phone}</if>
<if test="house.area != null "> and jh.area = #{house.area}</if>
@@ -157,6 +163,9 @@
<if test="house.unit != null and house.unit != ''"> and jh.unit = #{house.unit}</if>
<if test="house.room != null and house.room != ''"> and jh.room = #{house.room}</if>
<if test="house.buildingNo != null "> and jh.building_no = #{house.buildingNo}</if>
+ <if test="house.regionCode != null and house.regionCode !='' ">
+ and jda.nei_code like concat('%',#{house.regionCode},'%')
+ </if>
</select>
<!--房屋自定义详情查询-->
@@ -278,7 +287,7 @@
<if test="aoiCode != null and aoiCode != ''">
and jda.aoi_code=#{aoiCode}
</if>
- <if test="userId != null">
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -290,6 +299,16 @@
jgm.user_id = #{userId}
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>
) a
@@ -322,7 +341,7 @@
<if test="aoiCode != null and aoiCode != ''">
and jda.aoi_code=#{aoiCode}
</if>
- <if test="userId != null">
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -333,6 +352,16 @@
WHERE
jgm.user_id = #{userId}
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>
) a
@@ -362,18 +391,28 @@
<if test="aoiCode != null and aoiCode != ''">
and jda.aoi_code=#{aoiCode}
</if>
- <if test="userId != null">
- AND jda.address_code IN (
- SELECT
- 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 jg.is_deleted = 0
- )
+ <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 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>
@@ -403,7 +442,7 @@
<if test="aoiCode != null and aoiCode != ''">
and jda.aoi_code=#{aoiCode}
</if>
- <if test="userId != null">
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -416,6 +455,16 @@
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>
) a
--
Gitblit v1.9.3