From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 187 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 150 insertions(+), 37 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 3db9562..a9df469 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -131,39 +131,63 @@
<!--自定义分页列表-->
<select id="selectHousePage" resultMap="houseAndHouseLabelMap">
- select jh.*,concat(building," ",unit," ",room) as address from jczz_house jh
- left join jczz_doorplate_address jda on jda.address_code = jh.house_code
- where is_deleted = 0
- <if test="house.id != null "> and id = #{house.id}</if>
+ select
+ jh.*,
+ concat(jh.building," ",jh.unit," ",jh.room) as address,
+ br.town_name as townStreetName,br.name as neiName
+ from jczz_house jh
+ left join jczz_grid_range jgr on jgr.house_code = jh.house_code
+ left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ left join blade_region br on br.code = jg.community_code
+ where jh.is_deleted = 0
+ <if test="house.id != null "> and jh.id = #{house.id}</if>
<if test="house.streetCode != null and house.streetCode != ''">
- and jda.town_street_code like concat('%',#{house.streetCode},'%')
+ and jda.town_street_code like concat('%',#{house.streetCode},'%')
</if>
- <if test="house.houseCode != null and house.houseCode != ''"> and house_code = #{house.houseCode}</if>
- <if test="house.districtCode != null and house.districtCode != ''"> and district_code = #{house.districtCode}</if>
+ <if test="house.houseCode != null and house.houseCode != ''"> and jh.house_code = #{house.houseCode}</if>
+ <if test="house.districtCode != null and house.districtCode != ''"> and jh.district_code = #{house.districtCode}</if>
<if test="house.districtName != null and house.districtName != ''">
- and district_name like concat('%',#{house.districtName},'%')
- </if>
+ and jh.district_name like concat('%',#{house.districtName},'%')
+ </if>
+ <if test="house.townStreetName!=null and house.townStreetName!=''">
+ and br.town_name like concat('%',#{house.townStreetName},'%')
+ </if>
+ <if test="house.neiName!=null and house.neiName!=''">
+ and br.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 phone = #{house.phone}</if>
- <if test="house.area != null "> and area = #{house.area}</if>
- <if test="house.propertyPrice != null "> and property_price = #{house.propertyPrice}</if>
- <if test="house.serviceDue != null "> and service_due = #{house.serviceDue}</if>
- <if test="house.floor != null "> and floor = #{house.floor}</if>
- <if test="house.building != null and house.building != ''"> and building = #{house.building}</if>
- <if test="house.unit != null and house.unit != ''"> and unit = #{house.unit}</if>
- <if test="house.room != null and house.room != ''"> and room = #{house.room}</if>
- <if test="house.buildingNo != null "> and building_no = #{house.buildingNo}</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>
+ <if test="house.propertyPrice != null "> and jh.property_price = #{house.propertyPrice}</if>
+ <if test="house.serviceDue != null "> and jh.service_due = #{house.serviceDue}</if>
+ <if test="house.floor != null "> and jh.floor = #{house.floor}</if>
+ <if test="house.building != null and house.building != ''"> and jh.building = #{house.building}</if>
+ <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>
<!--房屋自定义详情查询-->
<select id="getHouseDetail" resultMap="houseAndHouseLabelMap">
select
jh.*,
- jhl.id as cid,jhl.*,jhl.remark as cremark
+ jhl.id as cid,jhl.*,jhl.remark as cremark,
+ br.code as neiCode,jg.id as gridId,br.town_code as streetCode
from jczz_house jh
- left join jczz_user_house_label jhl on jh.house_code = jhl.house_code
- where jh.is_deleted = 0 and jhl.lable_type = 2
- and jh.house_code = #{house.houseCode}
+ left join jczz_user_house_label jhl on jh.house_code = jhl.house_code and jhl.lable_type = 2
+ left join jczz_grid_range jgr on jgr.house_code = jh.house_code
+ left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ left join blade_region br on br.code = jg.community_code
+ where jh.is_deleted = 0
+ <if test="house.houseCode!=null and house.houseCode!=''">
+ and jh.house_code = #{house.houseCode}
+ </if>
+ <if test="house.id!=null">
+ and jh.id = #{house.id}
+ </if>
</select>
<!--房屋数据导出-->
@@ -263,7 +287,18 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
- <if test="userId != null">
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
+
+ <if test="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
+ </if>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}
+ </if>
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -275,6 +310,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
@@ -294,7 +339,20 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
- <if test="userId != null">
+ and jda.doorplate_type = '户室牌'
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
+
+ <if test="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
+ AND jda.unit_code is not null
+ </if>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}
+ </if>
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -305,6 +363,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
@@ -321,18 +389,41 @@
WHERE
jda.nei_code = #{code}
AND jhh.is_deleted = 0
- <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
- )
+ and jda.doorplate_type = '户室牌'
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
+
+ <if test="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
+ AND jda.unit_code is not null
+ </if>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}
+ </if>
+ <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>
@@ -350,7 +441,19 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
- <if test="userId != null">
+ AND jda.unit_code is not null
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
+
+ <if test="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
+ </if>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}
+ </if>
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -363,6 +466,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