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/HouseholdMapper.xml | 67 ++++++++++++++-------------------
1 files changed, 29 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index e6eecf3..b08e12d 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -243,21 +243,15 @@
<select id="getHouseHoldStatistics" resultType="java.util.Map">
-
- SELECT
- a.gender,
- count( a.gender ) numbers
- FROM
- (
SELECT
CASE
-
WHEN
jh.gender = 1 THEN
'男'
WHEN jh.gender = 0 THEN
'女' ELSE '未知'
- END AS gender
+ END AS gender,
+ count( 1 ) numbers
FROM
jczz_household jh
LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
@@ -265,22 +259,23 @@
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
- )
+ 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 jh.house_code = jgr.house_code
+ AND jg.is_deleted = 0
+ )
</if>
- ) a
GROUP BY
- a.gender
+ gender
+
+
</select>
<select id="getHouseHoldStatisticsAge" resultType="java.util.Map">
@@ -300,24 +295,20 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
- GROUP BY
- age
<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
- )
+ 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>
- ORDER BY
- age
+ GROUP BY age
</select>
--
Gitblit v1.9.3