From 04a0b7a7cae7bee8808bbc3587dddc4f955d204f Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jan 2024 13:46:57 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 108 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 94 insertions(+), 14 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 3d91c55..9467775 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -174,11 +174,11 @@
jczz_household jh
LEFT 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
- LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
<where>
<if test="household.userId!=null">
- AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
)
</if>
<if test="household.name!=null and household.name !=''">
@@ -283,12 +283,12 @@
jczz_household jh
LEFT 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
- LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
where jh.is_deleted = 0
and jh.name != '' and jh.name is not null
<if test="household.userId!=null">
- AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
)
</if>
<if test="household.name!=null and household.name !=''">
@@ -545,7 +545,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
@@ -597,7 +597,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
GROUP BY age
@@ -668,12 +668,12 @@
jczz_household jh
LEFT 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
- LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
LEFT JOIN jczz_user_house_label juhl on juhl.house_code = jda.address_code and lable_type=1
<where>
<if test="household.userId!=null">
- AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
)
</if>
<if test="household.name!=null and household.name !=''">
@@ -789,11 +789,11 @@
jczz_household jh
LEFT 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
- LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
<where>
<if test="household.userId!=null">
- AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
)
</if>
<if test="household.name!=null and household.name !=''">
@@ -951,5 +951,85 @@
</choose>
)
</select>
+ <select id="getlabelStatistics" resultType="org.springblade.common.node.TreeIntegerNode">
+ SELECT
+ jl.id AS id,
+ jl.parent_id AS parentId,
+ jl.label_name AS name,
+ jl.sort,
+ (SELECT
+ count(juhl.household_id ) counts
+ FROM
+ jczz_user_house_label juhl
+ LEFT JOIN jczz_household jh ON juhl.household_id = jh.id
+ LEFT 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
+ LEFT JOIN jczz_grid jg ON jg.grid_code = jhs.grid_code AND jg.is_deleted = 0
+ <where>
+ <if test="household.userId!=null">
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
+ )
+ </if>
+ <if test="household.name!=null and household.name !=''">
+ and jh.name like concat('%',#{household.name},'%')
+ </if>
+ <if test="household.houseCode!=null and household.houseCode !=''">
+ and jh.house_code = #{household.houseCode}
+ </if>
+ <if test="household.phoneNumber!=null and household.phoneNumber !=''">
+ and jh.phone_number like concat('%',#{household.phoneNumber},'%')
+ </if>
+ <if test="household.idCard!=null and household.idCard !=''">
+ and jh.id_card like concat('%',#{household.idCard},'%')
+ </if>
+ <if test="household.aoiName!=null and household.aoiName !=''">
+ and jhs.district_name like concat('%',#{household.aoiName},'%')
+ </if>
+ <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>
+ <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
+ AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
+ </if>
+ <if test="household.regionCode!=null and household.regionCode!=''">
+ and jg.community_code like concat(#{household.regionCode},'%')
+ </if>
+ <if test="household.building!=null and household.building!=''">
+ and jhs.building like concat(#{household.building},'%')
+ </if>
+ <if test="household.unit!=null and household.unit!=''">
+ and jhs.unit like concat(#{household.unit},'%')
+ </if>
+ <if test="household.aoiCode!=null and household.aoiCode!=''">
+ and jhs.district_code = #{household.aoiCode}
+ </if>
+ <if test="household.labelId != null ">
+ AND jl.id = #{household.labelId}
+ </if>
+ <if test="household.parentId != null ">
+ AND jl.parent_id = #{household.parentId}
+ </if>
+ AND juhl.label_id IS NOT NULL
+ and juhl.lable_type = 1
+ and jh.is_deleted = 0
+ AND juhl.label_id = jl.id
+ </where>
+ ) count
+ FROM
+ jczz_label jl where is_deleted = 0
+ and jl.id != '1002'
+ and jl.id != '1001'
+ and jl.parent_id != '1001'
+ </select>
</mapper>
--
Gitblit v1.9.3