From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml | 139 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 126 insertions(+), 13 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 29e1b53..5c014e2 100644
--- a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
@@ -98,7 +98,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '19'
+ AND jl.id = '1025'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -117,7 +117,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '20'
+ AND jl.id = '1034'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -137,7 +137,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '22'
+ AND jl.id = '1035'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -157,7 +157,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '23'
+ AND jl.id = '1036'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -177,7 +177,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '1025'
+ AND jl.id = '19'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -188,12 +188,71 @@
LEFT JOIN jczz_community jc on jc.`code` = jg.community_code
WHERE
br.`code` = jc.`street_code`
- )) number5
+ )) number5,
+ (
+ 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`
+ )) number6,(
+ 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`
+ )) number7,
+ (
+ 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`
+ )) number8
FROM
`blade_region` br
WHERE
br.region_level = 4
- AND br.city_code = 361100000000
+ AND br.city_code = 361100
</select>
@@ -210,7 +269,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '19'
+ AND jl.id = '1025'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -228,7 +287,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '20'
+ AND jl.id = '1034'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -247,7 +306,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '22'
+ AND jl.id = '1035'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -266,7 +325,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '23'
+ AND jl.id = '1036'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -285,7 +344,7 @@
LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
WHERE
juhl.lable_type = 1
- AND jl.id = '1025'
+ AND jl.id = '19'
AND juhl.household_id IS NOT NULL
AND juhl.house_code IN (
SELECT
@@ -295,7 +354,61 @@
LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
WHERE
jc.`code` = jg.community_code
- )) number5
+ )) number5,(
+ 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
+ )) number6,(
+ 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
+ )) number7,(
+ 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
+ )) number8
FROM
`jczz_community` jc
WHERE
--
Gitblit v1.9.3