From 625d68d8fa25b0077bd8ff9608f03f2b17e6208d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 20 Jan 2024 18:04:07 +0800
Subject: [PATCH] 房屋新增网格编号及查询调整
---
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
index be9278d..b1e9eee 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -49,8 +49,18 @@
<if test="gridWorkLog.neiName!=null and gridWorkLog.neiName!=''">
and jda.nei_name like concat('%',#{gridWorkLog.neiName},'%')
</if>
- <if test="gridWorkLog.regionCode!=null and gridWorkLog.regionCode!=''">
- and jg.community_code like concat('%',#{gridWorkLog.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>
</select>
@@ -58,13 +68,13 @@
<select id="getGridWorkCountHandleCount" resultType="java.lang.Integer">
select count(*) from jczz_grid_work_log jgwl
left join jczz_household jh on jgwl.household_id = jh.id and jh.is_deleted = 0
- left join jczz_grid_range jgr on jgr.house_code=jh.house_code
+ left join jczz_house jhs on jhs.house_code=jh.house_code
where jgwl.is_deleted = 0
<if test="status!=null">
and jgwl.status = #{status}
</if>
- <if test="gridId!=null">
- and jgr.grid_id = #{gridId}
+ <if test="gridCode!=null and gridCode!=''">
+ and jhs.grid_code = #{gridCode}
</if>
</select>
--
Gitblit v1.9.3