From bc670e87f764e250a54b1687dedbe0df135b411f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 Nov 2023 14:12:08 +0800
Subject: [PATCH] 房屋树查询新增，房屋，住户，租赁查询修改
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 96 insertions(+), 26 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 08dc5ab..e5f9420 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -27,6 +27,25 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <!--过滤网格数据-->
+ <sql id="filterHouseGrid">
+ <if test="houseParam.roleName!=null and houseParam.roleName!=''">
+ <if test="houseParam.roleName=='网格员'">
+ <choose>
+ <when test="list != null and list.size()>0">
+ and house_code in
+ <foreach collection="list" item="houseCode" separator ="," open="(" close=")">
+ #{houseCode}
+ </foreach>
+ </when>
+ <otherwise>
+ and house_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </if>
+ </sql>
+
<sql id="selectHouse">
select
id,
@@ -66,31 +85,25 @@
</resultMap>
<!--自定义分页列表-->
- <select id="selectHousePage" resultMap="houseResultMap">
- <include refid="selectHouse"/>
- <where>
- <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 = #{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.imageUrls != null and house.imageUrls != ''"> and image_urls = #{house.imageUrls}</if>
- <if test="house.createUser != null and house.createUser != ''"> and create_user = #{house.createUser}</if>
- <if test="house.createTime != null "> and create_time = #{house.createTime}</if>
- <if test="house.updateUser != null and house.updateUser != ''"> and update_user = #{house.updateUser}</if>
- <if test="house.updateTime != null "> and update_time = #{house.updateTime}</if>
- <if test="house.remark != null and house.remark != ''"> and remark = #{house.remark}</if>
- <if test="house.isDeleted != null "> and is_deleted = #{house.isDeleted}</if>
- </where>
+ <select id="selectHousePage" resultType="org.springblade.modules.house.vo.HouseVO">
+ select *,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.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>
</select>
<!--房屋自定义详情查询-->
@@ -105,7 +118,7 @@
</select>
- <select id="export" resultType="org.springblade.modules.system.excel.HouseExcel">
+ <select id="export" resultType="org.springblade.modules.house.excel.HouseExcel">
<include refid="selectHouse"/>
<where>
<if test="id != null "> and id = #{id}</if>
@@ -134,4 +147,61 @@
</select>
+ <!--获取房屋树-->
+ <select id="getHouseTree" resultType="org.springblade.modules.house.vo.HouseTree">
+ SELECT
+ district_code as code,
+ district_name as name,
+ 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
+ on jda.aoi_code = jh.district_code
+ WHERE jda.nei_code = #{houseParam.code}
+ <include refid="filterHouseGrid"/>
+ GROUP BY district_code,district_name,nei_code
+ union all
+ (
+ SELECT
+ building as code,
+ building as name,
+ 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
+ on jda.aoi_code = jh.district_code
+ WHERE jda.nei_code = #{houseParam.code}
+ <include refid="filterHouseGrid"/>
+ GROUP BY building,district_code
+ )
+ union all
+ (
+ select
+ unit as code,
+ unit name,
+ 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
+ on jda.aoi_code = jh.district_code
+ WHERE jda.nei_code = #{houseParam.code}
+ <include refid="filterHouseGrid"/>
+ group by unit,building
+ )
+ union all
+ (
+ select
+ room as code,
+ room name,
+ unit 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
+ on jda.aoi_code = jh.district_code
+ WHERE jda.nei_code = #{houseParam.code}
+ <include refid="filterHouseGrid"/>
+ )
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3