From d0b0e00e40226700a0ffa1f1671a8dc273610f67 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 18 Dec 2023 14:28:10 +0800
Subject: [PATCH] 菜单分类优化
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 233 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 199 insertions(+), 34 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 e5f9420..3db9562 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -76,25 +76,74 @@
<!--房屋详情-->
<resultMap id="houseAndHouseLabelMap" type="org.springblade.modules.house.vo.HouseVO" autoMapping="true">
+ <result column="id" property="id"/>
+ <result column="house_code" property="houseCode"/>
+ <result column="district_code" property="districtCode"/>
+ <result column="district_name" property="districtName"/>
+ <result column="house_name" property="houseName"/>
+ <result column="phone" property="phone"/>
+ <result column="area" property="area"/>
+ <result column="property_price" property="propertyPrice"/>
+ <result column="service_due" property="serviceDue"/>
+ <result column="floor" property="floor"/>
+ <result column="building" property="building"/>
+ <result column="unit" property="unit"/>
+ <result column="room" property="room"/>
+ <result column="building_no" property="buildingNo"/>
+ <result column="image_urls" property="imageUrls"/>
+ <result column="create_user" property="createUser"/>
+ <result column="created_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <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"
+ ofType="org.springblade.modules.house.vo.UserHouseLabelVO" autoMapping="true">
+ </collection>
+ </resultMap>
+
+
+ <select id="selectHouseLabelPage" resultType="org.springblade.modules.house.vo.HouseholdLabelVO">
+ select
+ id,
+ house_code,
+ label_id,
+ label_name,
+ color,
+ remark cremark,
+ user_id,
+ lable_type,
+ household_id
+ from
+ jczz_user_house_label
+ where house_code = #{houseCode} and lable_type = 2
+ </select>
+
+ <!--房屋详情-->
+ <resultMap id="housePageAndHouseLabelMap" type="org.springblade.modules.house.vo.HouseVO" autoMapping="true">
<id property="id" column="id"/>
- <collection property="houseLabelVOList" javaType="java.util.List"
- ofType="org.springblade.modules.house.vo.HouseLabelVO" autoMapping="true">
+ <collection property="userHouseLabelVOList" javaType="java.util.List"
+ ofType="org.springblade.modules.house.vo.UserHouseLabelVO" autoMapping="true">
<id property="id" column="cid"/>
<result property="remark" column="cremark"/>
</collection>
</resultMap>
<!--自定义分页列表-->
- <select id="selectHousePage" resultType="org.springblade.modules.house.vo.HouseVO">
- select *,concat(building," ",unit," ",room) as address from jczz_house
+ <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>
+ <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 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.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>
@@ -112,38 +161,34 @@
jh.*,
jhl.id as cid,jhl.*,jhl.remark as cremark
from jczz_house jh
- left join jczz_house_label jhl on jh.house_code = jhl.house_code
- where jh.is_deleted = 0
+ 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}
</select>
-
+ <!--房屋数据导出-->
<select id="export" resultType="org.springblade.modules.house.excel.HouseExcel">
- <include refid="selectHouse"/>
- <where>
- <if test="id != null "> and id = #{id}</if>
- <if test="houseCode != null and houseCode != ''"> and house_code = #{houseCode}</if>
- <if test="districtCode != null and districtCode != ''"> and district_code = #{districtCode}</if>
- <if test="districtName != null and districtName != ''"> and district_name = #{districtName}</if>
- <if test="houseName != null and houseName != ''"> and house_name = #{houseName}</if>
- <if test="phone != null and phone != ''"> and phone = #{phone}</if>
- <if test="area != null "> and area = #{area}</if>
- <if test="propertyPrice != null "> and property_price = #{propertyPrice}</if>
- <if test="serviceDue != null "> and service_due = #{serviceDue}</if>
- <if test="floor != null "> and floor = #{floor}</if>
- <if test="building != null and building != ''"> and building = #{building}</if>
- <if test="unit != null and unit != ''"> and unit = #{unit}</if>
- <if test="room != null and room != ''"> and room = #{room}</if>
- <if test="buildingNo != null "> and building_no = #{buildingNo}</if>
- <if test="imageUrls != null and imageUrls != ''"> and image_urls = #{imageUrls}</if>
- <if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
- <if test="createTime != null "> and create_time = #{createTime}</if>
- <if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
- <if test="updateTime != null "> and update_time = #{updateTime}</if>
- <if test="remark != null and remark != ''"> and remark = #{remark}</if>
- <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
- </where>
-
+ 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>
@@ -196,7 +241,8 @@
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
+ (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"/>
@@ -204,4 +250,123 @@
</select>
+ <select id="getHouseStatisticsOne" resultType="java.lang.Integer">
+ SELECT
+ count( 1 )
+ FROM
+ (
+ SELECT DISTINCT
+ jda.building_code
+ FROM
+ jczz_house jh
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+ WHERE
+ jda.nei_code = #{code}
+ AND jh.is_deleted = 0
+ <if test="userId != null">
+ 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>
+ ) a
+
+ </select>
+
+
+ <select id="getHouseStatisticsTwo" resultType="java.lang.Integer">
+ SELECT
+ count( 1 )
+ FROM
+ (
+ SELECT DISTINCT
+ jda.address_code
+ FROM
+ jczz_house jh
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+ WHERE
+ jda.nei_code = #{code}
+ AND jh.is_deleted = 0
+ <if test="userId != null">
+ 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>
+ ) a
+
+ </select>
+
+
+ <select id="getHouseStatisticsThree" resultType="java.lang.Integer">
+ SELECT
+ count( 1 )
+ FROM
+ jczz_household jhh
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhh.house_code
+ 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
+ )
+ </if>
+ </select>
+
+
+ <select id="getHouseStatisticsFour" resultType="java.lang.Integer">
+ SELECT
+ count( 1 )
+ FROM
+ (
+ SELECT DISTINCT
+ jda.unit_code
+ FROM
+ jczz_house jh
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+ WHERE
+ jda.nei_code = #{code}
+ AND jh.is_deleted = 0
+ <if test="userId != null">
+ 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>
+ ) a
+
+
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3