From 9d521d0ff5fe8b09ceb9d7f2ec0f883048860810 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 04 Jan 2024 18:32:30 +0800
Subject: [PATCH] bug修复+通过小区id 查询小区的楼栋和单元
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 123 ++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 45 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 fd70ca7..7d2e8d3 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -34,7 +34,7 @@
<choose>
<when test="list != null and list.size()>0">
and house_code in
- <foreach collection="list" item="houseCode" separator ="," open="(" close=")">
+ <foreach collection="list" item="houseCode" separator="," open="(" close=")">
#{houseCode}
</foreach>
</when>
@@ -97,7 +97,8 @@
<result column="update_time" property="updateTime"/>
<result column="remark" property="remark"/>
<result column="is_deleted" property="isDeleted"/>
- <collection property="userHouseLabelVOList" javaType="java.util.List" select="selectHouseLabelPage" column="house_code"
+ <collection property="userHouseLabelVOList" javaType="java.util.List" select="selectHouseLabelPage"
+ column="house_code"
ofType="org.springblade.modules.house.vo.UserHouseLabelVO" autoMapping="true">
</collection>
</resultMap>
@@ -141,12 +142,14 @@
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.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},'%')
</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.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 jh.district_name like concat('%',#{house.districtName},'%')
</if>
@@ -156,18 +159,20 @@
<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 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.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>
+ <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 jg.community_code like concat('%',#{house.regionCode},'%')
+ and jg.community_code like concat('%',#{house.regionCode},'%')
</if>
</select>
@@ -198,22 +203,23 @@
concat(building," ",unit," ",room) as address
from jczz_house
where is_deleted = 0
- <if test="house.id != null "> and id = #{house.id}</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.id != null ">and id = #{house.id}</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.districtName != null and house.districtName != ''">
and district_name like concat('%',#{house.districtName},'%')
</if>
- <if test="house.houseName != null and house.houseName != ''"> and house_name = #{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.houseName != null and house.houseName != ''">and house_name = #{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>
</select>
@@ -225,7 +231,8 @@
jda.nei_code as parentCode
FROM jczz_house jh
left join
- (select nei_code,aoi_code from jczz_doorplate_address where nei_code = #{houseParam.code} group by nei_code,aoi_code) jda
+ (select nei_code,aoi_code from jczz_doorplate_address where nei_code = #{houseParam.code} group by
+ nei_code,aoi_code) jda
on jda.aoi_code = jh.district_code
WHERE jda.nei_code = #{houseParam.code}
<include refid="filterHouseGrid"/>
@@ -238,7 +245,8 @@
district_code as parentCode
FROM jczz_house jh
left join
- (select nei_code,aoi_code from jczz_doorplate_address where nei_code = #{houseParam.code} group by nei_code,aoi_code) jda
+ (select nei_code,aoi_code from jczz_doorplate_address where nei_code = #{houseParam.code} group by
+ nei_code,aoi_code) jda
on jda.aoi_code = jh.district_code
WHERE jda.nei_code = #{houseParam.code}
<include refid="filterHouseGrid"/>
@@ -252,7 +260,8 @@
building as parentCode
FROM jczz_house jh
left join
- (select nei_code,aoi_code from jczz_doorplate_address where nei_code = #{houseParam.code} group by nei_code,aoi_code) jda
+ (select nei_code,aoi_code from jczz_doorplate_address where nei_code = #{houseParam.code} group by
+ nei_code,aoi_code) jda
on jda.aoi_code = jh.district_code
WHERE jda.nei_code = #{houseParam.code}
<include refid="filterHouseGrid"/>
@@ -276,7 +285,7 @@
<select id="getHouseStatisticsOne" resultType="java.lang.Integer">
- SELECT
+ SELECT
count( 1 )
FROM
(
@@ -300,17 +309,17 @@
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
- )
+ 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
@@ -388,7 +397,7 @@
jczz_household jhh
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhh.house_code
WHERE
- jda.nei_code = #{code}
+ jda.nei_code = #{code}
AND jhh.is_deleted = 0
and jda.doorplate_type = '户室牌'
<if test="buildingCode != null and buildingCode != ''">
@@ -482,5 +491,29 @@
</select>
+ <select id="getHouseBuilding" resultType="java.lang.String">
+ SELECT DISTINCT
+ jh.building
+ FROM
+ jczz_house jh
+ LEFT JOIN jczz_district jd ON jd.aoi_code = jh.district_code
+ WHERE
+ jd.id = #{districtCode}
+ and jh.building is not null
+ </select>
+
+ <select id="getHouseUnit" resultType="java.lang.String">
+ SELECT DISTINCT
+ jh.unit
+ FROM
+ jczz_house jh
+ LEFT JOIN jczz_district jd ON jd.aoi_code = jh.district_code
+ WHERE
+ jd.id = #{districtCode}
+ and jd.building = #{building}
+ and jh.building is not null
+
+ </select>
+
</mapper>
--
Gitblit v1.9.3