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/HouseholdMapper.xml | 132 +++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 49 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 11fe4a6..693bec8 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -117,9 +117,12 @@
select
jh.*,
jhs.district_name aoiName,
- concat(jhs.building," ",unit," ",room) as address
+ concat(jhs.building," ",unit," ",room) as address,
+ jda.town_street_name as townStreetName,jda.nei_name as neiName
from
- jczz_household jh join jczz_house jhs on jh.house_code = jhs.house_code and jhs.is_deleted = 0
+ jczz_household jh
+ join jczz_house jhs on jh.house_code = jhs.house_code and jhs.is_deleted = 0
+ left join jczz_doorplate_address jda on jda.address_code = jh.house_code
where jh.is_deleted = 0
<if test="household.name!=null and household.name !=''">
and jh.name like concat('%',#{household.name},'%')
@@ -139,7 +142,12 @@
<if test="household.confirmFlag != null ">
and jh.confirm_flag = #{household.confirmFlag}
</if>
-
+ <if test="household.townStreetName!=null and household.townStreetName!=''">
+ and jda.town_street_name like concat('%',#{household.townStreetName},'%')
+ </if>
+ <if test="household.neiName!=null and household.neiName!=''">
+ and jda.nei_name like concat('%',#{household.neiName},'%')
+ </if>
<if test="household.housingRentalId != null ">
and jh.housing_rental_id = #{household.housingRentalId}
</if>
@@ -240,6 +248,7 @@
LEFT JOIN jczz_property_company_district jpcd on jpcd.district_id=jd.id
WHERE 1=1
AND jda.address_code = #{household.houseCode}
+ limit 1
</select>
<!--查询网格-->
@@ -267,38 +276,49 @@
<select id="getHouseHoldStatistics" resultType="java.util.Map">
SELECT
- CASE
- WHEN
- jh.gender = 1 THEN
- '男'
- WHEN jh.gender = 0 THEN
- '女' ELSE '未知'
- END AS gender,
- count( 1 ) numbers
+ a.gender,
+ count( a.gender ) numbers
+ FROM
+ ( SELECT
+ IF
+ (
+ id_card IS NULL or id_card = '',
+ '未知',
+ IF
+ (SUBSTRING( id_card, 17, 1 ) % 2 = 1, '男', '女' )) AS gender
FROM
jczz_household jh
LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
- <if test="userId != null">
- 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
- )
+ and jda.doorplate_type = '户室牌'
+ <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
GROUP BY
- gender
-
-
+ a.gender
</select>
<select id="getHouseHoldStatisticsAge" resultType="java.util.Map">
@@ -307,29 +327,43 @@
when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 0 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 3 then '0~3岁'
when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 4 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 17 then '4~17岁'
when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 18 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 39 then '18~39岁'
- when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 40 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 59 then '40~59岁'
- when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 60 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 79 then '60~79岁'
- when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ > ]]> 80 then '80岁以上'
- ELSE '无身份信息'
- END AS age,
- count(1) as number FROM
- jczz_household jh
- LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 40 and
+ TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 59 then '40~59岁'
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 60 and
+ TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 79 then '60~79岁'
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ > ]]> 80 then '80岁以上'
+ ELSE '无身份信息'
+ END AS age,
+ count(1) as number FROM
+ jczz_household jh
+ LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
WHERE
- jda.nei_code = #{code}
- AND jh.is_deleted = 0
- <if test="userId != null">
- 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
- )
+ jda.nei_code = #{code}
+ and jda.doorplate_type = '户室牌'
+ AND jh.is_deleted = 0
+ <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>
GROUP BY age
</select>
--
Gitblit v1.9.3