From 6e9f2c5ade8802645fd4e0b718ae14d40066b4d5 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 15 Dec 2023 18:17:21 +0800
Subject: [PATCH] 管理后台优化
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 153 ++++++++++++++++++++-------------------------------
1 files changed, 60 insertions(+), 93 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..98c0d5d 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -86,15 +86,19 @@
<!--自定义分页列表-->
<select id="selectHousePage" resultType="org.springblade.modules.house.vo.HouseVO">
- select *,concat(building," ",unit," ",room) as address from jczz_house
+ 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>
@@ -202,41 +206,33 @@
<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
-
+ jda.nei_code = #{code}
+ AND jh.is_deleted = 0
<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
- )
- </if>
-
- GROUP BY
- jda.building_code
+ 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>
@@ -244,75 +240,55 @@
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
<if test="userId != null">
- AND EXISTS (
- SELECT
- *
+ 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
- )
+ ) 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
- *
- 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>
+ 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>
@@ -320,38 +296,29 @@
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
<if test="userId != null">
- AND EXISTS (
- SELECT
- *
+ 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
- )
+ ) a
</select>
--
Gitblit v1.9.3