From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 9fbd3de..59ed4ca 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -407,10 +407,12 @@
jczz_house jh
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
<where>
- jda.nei_code in
- <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <if test="communityCodeList != null and communityCodeList.size()>0">
+ jda.nei_code in
+ <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </if>
AND jh.is_deleted = 0
<if test="buildingCode != null and buildingCode != ''">
and jda.building_code=#{buildingCode}
@@ -462,10 +464,12 @@
LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
<where>
- jda.nei_code in
- <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <if test="communityCodeList != null and communityCodeList.size()>0">
+ jda.nei_code in
+ <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </if>
and jda.doorplate_type = '户室牌'
<choose>
<when test="(buildingCode != null and buildingCode != '') or
@@ -842,12 +846,19 @@
<!--查询未绑定网格或警格的数据-->
<select id="getNotBindGridOrJwGridList" resultType="org.springblade.modules.house.entity.HouseEntity">
- select id,lng,lat from jczz_house where is_deleted = 0 and lng != ''
+ SELECT
+ jh.id,
+ IFNULL(jh.lng,jda.x) lng,
+ IFNULL(jh.lat,jda.y) lat
+ FROM
+ jczz_house jh INNER JOIN jczz_doorplate_address jda on jda.address_code=jh.house_code
+ WHERE
+ jh.is_deleted = 0
<if test="type == 1">
- and grid_code is null
+ and jh.grid_code is null
</if>
<if test="type == 2">
- and jw_grid_code is null
+ and jh.jw_grid_code is null
</if>
</select>
@@ -870,7 +881,7 @@
LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN jczz_user_house_label juhl ON juhl.house_code = jh.house_code and juhl.lable_type = 2
where jda.doorplate_type = '户室牌'
- <if test="communityCodeList != null">
+ <if test="communityCodeList !=null and communityCodeList.size()>0">
and jda.nei_code in
<foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
#{code}
--
Gitblit v1.9.3