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 | 335 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 230 insertions(+), 105 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 c63e214..a9df469 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -76,6 +76,51 @@
<!--房屋详情-->
<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="userHouseLabelVOList" javaType="java.util.List"
ofType="org.springblade.modules.house.vo.UserHouseLabelVO" autoMapping="true">
@@ -85,36 +130,64 @@
</resultMap>
<!--自定义分页列表-->
- <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>
+ <select id="selectHousePage" resultMap="houseAndHouseLabelMap">
+ 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},'%')
+ </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>
- <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>
+ 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 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>
<!--房屋数据导出-->
@@ -202,41 +275,54 @@
<select id="getHouseStatisticsOne" resultType="java.lang.Integer">
- SELECT
+ SELECT
count( 1 )
FROM
- jczz_house jh
- WHERE
- jh.is_deleted = 0
- AND
- EXISTS (
- SELECT
+ (
+ SELECT DISTINCT
jda.building_code
FROM
- jczz_doorplate_address jda
+ jczz_house jh
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
WHERE
- jh.house_code = jda.address_code
- AND jda.nei_code = #{code}
- AND jda.building_code IS NOT NULL
-
- <if test="userId != null">
- AND EXISTS (
- SELECT
- *
- 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 jh.house_code = jgr.house_code
- AND jg.is_deleted = 0
- )
+ jda.nei_code = #{code}
+ AND jh.is_deleted = 0
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
</if>
- GROUP BY
- jda.building_code
+ <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
+ 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>
+ ) a
+
</select>
@@ -244,75 +330,101 @@
SELECT
count( 1 )
FROM
- jczz_house jh
- WHERE
- jh.is_deleted = 0
- AND
- EXISTS (
- SELECT
+ (
+ SELECT DISTINCT
jda.address_code
FROM
- jczz_doorplate_address jda
+ jczz_house jh
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
WHERE
- jh.house_code = jda.address_code
- AND jda.nei_code = #{code}
- AND jda.building_code IS NOT NULL
+ jda.nei_code = #{code}
+ AND jh.is_deleted = 0
+ and jda.doorplate_type = '户室牌'
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
- <if test="userId != null">
- AND EXISTS (
- SELECT
- *
+ <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 jh.house_code = jgr.house_code
AND jg.is_deleted = 0
)
</if>
-
- GROUP BY
- jda.address_code
- )
+ <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
</select>
<select id="getHouseStatisticsThree" resultType="java.lang.Integer">
SELECT
- count(1)
+ count( 1 )
FROM
jczz_household jhh
- LEFT JOIN jczz_house jh ON jhh.house_code = jh.house_code
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhh.house_code
WHERE
- jh.is_deleted = 0
+ jda.nei_code = #{code}
AND jhh.is_deleted = 0
- AND jhh.house_code IN (
- SELECT
- jda.address_code
- FROM
- jczz_doorplate_address jda
- WHERE
- jh.house_code = jda.address_code
- AND jda.nei_code = #{code}
- <if test="userId != null">
- AND EXISTS (
- SELECT
- *
+ 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 jh.house_code = jgr.house_code
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>
@@ -320,38 +432,51 @@
SELECT
count( 1 )
FROM
- jczz_house jh
- WHERE
- jh.is_deleted = 0
- AND
- EXISTS (
- SELECT
+ (
+ SELECT DISTINCT
jda.unit_code
FROM
- jczz_doorplate_address jda
+ jczz_house jh
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
WHERE
- jh.house_code = jda.address_code
- AND jda.nei_code = #{code}
- AND jda.building_code IS NOT NULL
+ jda.nei_code = #{code}
+ AND jh.is_deleted = 0
+ AND jda.unit_code is not null
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
- <if test="userId != null">
- AND EXISTS (
- SELECT
- *
+ <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
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 jh.house_code = jgr.house_code
AND jg.is_deleted = 0
)
</if>
-
- GROUP BY
- jda.unit_code
- )
+ <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
</select>
--
Gitblit v1.9.3