From 96bc2773501df383ffe5f0bf77073e7d109e43fa Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 11 Mar 2024 15:19:39 +0800
Subject: [PATCH] 场所详细查询返回绑定多个房屋的二维码编号和标准地址
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 6 ++++++
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java | 8 ++++++++
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 2 ++
src/main/java/org/springblade/modules/place/vo/PlaceVO.java | 7 +++++++
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 9 +++++++++
5 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index fa1c703..1eebc43 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -575,6 +575,12 @@
<if test="doorplateAddress.poi!=null and doorplateAddress.poi!=''">
and jda.poi like concat('%',#{doorplateAddress.poi},'%')
</if>
+ <if test="doorplateAddress.addressCode!=null and doorplateAddress.addressCode!=''">
+ and jda.address_code in
+ <foreach collection="addressCode.split(',')" item="addressCode" open="(" close=")" separator=",">
+ #{addressCode}
+ </foreach>
+ </if>
<if test="isAdministrator==2">
<choose>
<when test="doorplateAddress.roleName != null and doorplateAddress.roleName != ''">
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
index 7c8ff1d..0433b77 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -25,6 +25,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
/**
* 场所表 Mapper 接口
@@ -180,4 +181,11 @@
* @return
*/
List<PlaceEntity> selectPlaceNotDoorBindList();
+
+ /**
+ * 查询绑定的房屋
+ * @param houseCodeBinds
+ * @return
+ */
+ List<Map<String,Object>> getHouseBindMap(@Param("houseCodeBinds") String houseCodeBinds);
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 5423ec2..e3b1c07 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -766,4 +766,13 @@
and source = 1 and house_code_binds is null
</select>
+ <!--查询绑定的房屋-->
+ <select id="getHouseBindMap" resultType="java.util.Map">
+ select address_code as addressCode,address_name addressName from jczz_doorplate_address
+ where address_code in
+ <foreach collection="houseCodeBinds.split(',')" item="houseCode" separator="," open="(" close=")">
+ #{houseCode}
+ </foreach>
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 60ea4b0..9211288 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -852,6 +852,8 @@
QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
+ // 查询绑定的房屋
+ placeVO.setHouseBindList(baseMapper.getHouseBindMap(placeVO.getHouseCodeBinds()));
}
} else {
// 查询地址编码信息（社区派出所相关信息）
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
index 9d9cfb0..55d83e2 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -28,7 +28,9 @@
import org.springblade.modules.place.entity.PlacePoiLabel;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 场所表 视图实体类
@@ -156,4 +158,9 @@
*/
private String roleName;
+ /**
+ * 房屋绑定
+ */
+ private List<Map<String,Object>> houseBindList = new ArrayList<>();
+
}
--
Gitblit v1.9.3