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/house/mapper/HouseMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 0ab811e..3f9e50e 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -138,8 +138,7 @@
br.town_name as townStreetName,br.name as neiName,
jg.grid_name
from jczz_house jh
- left join jczz_grid_range jgr on jgr.house_code = jh.house_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 = jh.grid_code and jg.is_deleted = 0
left join blade_region br on br.code = jg.community_code
<where>
<if test="house.id != null ">and jh.id = #{house.id}</if>
@@ -171,8 +170,18 @@
<if test="house.unit != null and house.unit != ''">and jh.unit = #{house.unit}</if>
<if test="house.room != null and house.room != ''">and jh.room = #{house.room}</if>
<if test="house.buildingNo != null ">and jh.building_no = #{house.buildingNo}</if>
- <if test="house.regionCode != null and house.regionCode !='' ">
- and jg.community_code like concat('%',#{house.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="house.parentId != null ">
and jh.house_code in (
@@ -194,7 +203,7 @@
</if>
and jh.is_deleted = 0
ORDER BY
- jh.update_time DESC
+ jh.update_time desc,jh.id desc
</where>
--
Gitblit v1.9.3