From 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 11 Mar 2024 15:40:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
index b18d802..54e1017 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
@@ -147,10 +147,10 @@
/**
* 查询社区信息
- * @param name
+ * @param doorplateAddressEntity
* @return
*/
- List<DoorplateAddressEntity> getAllDoorplateAddress(@Param("name") String name);
+ List<DoorplateAddressEntity> getAllDoorplateAddress(@Param("doorplateAddressEntity") DoorplateAddressEntity doorplateAddressEntity);
/**
* 获取房屋树
@@ -195,10 +195,22 @@
List<Long> getAoiCodeList();
/**
- * 查询所有的地址表和场所表差集集合
+ * 查询所有的地址表和场所表差集集合(没有入库的)
* @return
*/
- List<DoorplateAddressEntity> getPlaceList();
+ List<DoorplateAddressEntity> getNotInPlaceList(@Param("townName") String townName);
+
+ /**
+ * 查询场所标准地址数据
+ * @param doorplateAddressVO
+ * @param size
+ * @return
+ */
+ List<DoorplateAddressEntity> getPlaceList(@Param("doorplateAddress") DoorplateAddressVO doorplateAddressVO,
+ @Param("size") Integer size,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 查询详情
@@ -212,4 +224,11 @@
* @return
*/
List<DoorplateAddressEntity> getAllCommunityList();
+
+ /**
+ * 通过小区id 查询楼栋编码
+ * @param districtId
+ * @return
+ */
+ List<DoorplateAddressVO> getHouseBuildingCode(String districtId);
}
--
Gitblit v1.9.3