From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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..8c08035 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);
/**
* 获取房屋树
@@ -163,9 +163,10 @@
@Param("list") List<String> list);
/**
* 查询所有户室数据
+ * @param townName
* @return
*/
- List<DoorplateAddressEntity> getHouseList();
+ List<DoorplateAddressEntity> getHouseList(@Param("townName") String townName);
/**
* 查询商超
@@ -195,10 +196,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 +225,18 @@
* @return
*/
List<DoorplateAddressEntity> getAllCommunityList();
+
+ /**
+ * 通过小区id 查询楼栋编码
+ * @param districtId
+ * @return
+ */
+ List<DoorplateAddressVO> getHouseBuildingCode(String districtId);
+
+ /**
+ * 查询绑定房屋总数
+ * @param townName
+ * @return
+ */
+ Integer getNotHouseListCount(@Param("townName") String townName);
}
--
Gitblit v1.9.3