From 514bda8dd09270c15919515091dee644d5a59518 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 11 Jan 2024 16:43:23 +0800
Subject: [PATCH] 重点人员及bug修复

---
 src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml |  204 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 195 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
index c5fdf4f..d815b73 100644
--- a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
@@ -86,11 +86,121 @@
 
     <select id="statisticalLabels" resultType="org.springblade.modules.house.vo.HouseholdLabelVO"
             parameterType="org.springblade.modules.house.vo.HouseholdLabelVO">
-        SELECT
+       SELECT
 	br.region_level,
+	br.`code` regionCode,
 	br.NAME regionName,
-	jc.`street_code`,
-	jc.NAME communityName,
+	(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '19'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+			LEFT JOIN  jczz_community jc on  jc.`code` = jg.community_code
+		WHERE
+			br.`code` = jc.`street_code`
+		)) number1,(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '20'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+			LEFT JOIN  jczz_community jc on  jc.`code` = jg.community_code
+		WHERE
+			br.`code` = jc.`street_code`
+		)) number2,
+		(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '22'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+			LEFT JOIN  jczz_community jc on  jc.`code` = jg.community_code
+		WHERE
+			br.`code` = jc.`street_code`
+		)) number3,
+		(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '23'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+			LEFT JOIN  jczz_community jc on  jc.`code` = jg.community_code
+		WHERE
+			br.`code` = jc.`street_code`
+		)) number4,
+		(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '1025'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+			LEFT JOIN  jczz_community jc on  jc.`code` = jg.community_code
+		WHERE
+			br.`code` = jc.`street_code`
+		)) number5
+FROM
+	`blade_region` br
+WHERE
+	br.region_level = 4
+	AND br.city_code = 3611
+    </select>
+
+
+    <select id="getCommunityStatisticalLabels" resultType="org.springblade.modules.house.vo.HouseholdLabelVO">
+
+SELECT
+jc.NAME communityName,
 		jc.code communityCode,
 	(
 	SELECT
@@ -100,7 +210,82 @@
 		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
 	WHERE
 		juhl.lable_type = 1
-		AND jl.parent_id = '103'
+		AND jl.id = '19'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+				WHERE
+		jc.`code` = jg.community_code
+		)) number1,(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '20'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+				WHERE
+		jc.`code` = jg.community_code
+		)) number2,
+		(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '22'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+			WHERE
+		jc.`code` = jg.community_code
+		)) number3,
+		(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '23'
+		AND juhl.household_id IS NOT NULL
+		AND juhl.house_code IN (
+		SELECT
+			jgr.house_code
+		FROM
+			jczz_grid jg
+			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+			WHERE
+		jc.`code` = jg.community_code
+		)) number4,
+		(
+	SELECT
+		count( 1 )
+	FROM
+		jczz_user_house_label juhl
+		LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+	WHERE
+		juhl.lable_type = 1
+		AND jl.id = '1025'
 		AND juhl.household_id IS NOT NULL
 		AND juhl.house_code IN (
 		SELECT
@@ -109,13 +294,14 @@
 			jczz_grid jg
 			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
 		WHERE
-			jc.`code` = jg.community_code
-		)) numbers
+		jc.`code` = jg.community_code
+		)) number5
 FROM
-	jczz_community jc
-	LEFT JOIN `blade_region` br ON br.`code` = jc.`street_code`
+	`jczz_community` jc
 WHERE
-	jc.street_code IS NOT NULL
+	jc.street_code = #{householdLabel.regionCode}
+
+
     </select>
 
 

--
Gitblit v1.9.3