From d46ca134f82fd106bfbbbd71aef7184805e6d7e7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 09:17:54 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 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 00a1ac9..3d91c55 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -211,8 +211,18 @@
<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 test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
</if>
<if test="household.building!=null and household.building!=''">
and jhs.building like concat(#{household.building},'%')
@@ -828,17 +838,20 @@
<if test="household.aoiCode!=null and household.aoiCode!=''">
and jhs.district_code = #{household.aoiCode}
</if>
- AND EXISTS (
- SELECT
- *
+ and jh.id in (
+ SELECT DISTINCT
+ juhl.household_id
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 = #{household.labelId}
- AND jl.parent_id = #{household.parentId}
- AND juhl.household_id = jh.id
+ <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 jh.is_deleted = 0
@@ -852,9 +865,10 @@
left join jczz_user_house_label juhl on juhl.household_id = jh.id
where jh.is_deleted = 0
and juhl.lable_type = 1
- and juhl.color = '#30D17C'
+ and juhl.color = 'green'
and jh.id in (
- select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(), create_time )=30
+ select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
+ create_time )=30
)
<choose>
<when test="list!=null and list.size()>0">
@@ -873,9 +887,10 @@
left join jczz_user_house_label juhl on juhl.household_id = jh.id
where jh.is_deleted = 0
and juhl.lable_type = 1
- and juhl.color = '#FFB42B'
+ and juhl.color = 'yellow'
and jh.id in (
- select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(), create_time )=14
+ select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
+ create_time )=14
)
<choose>
<when test="list!=null and list.size()>0">
@@ -895,9 +910,10 @@
left join jczz_user_house_label juhl on juhl.household_id = jh.id
where jh.is_deleted = 0
and juhl.lable_type = 1
- and juhl.color = '#EA1F1F'
+ and juhl.color = 'red'
and jh.id in (
- select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(), create_time )=7
+ select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
+ create_time )=7
)
<choose>
<when test="list!=null and list.size()>0">
--
Gitblit v1.9.3