From fb798e4982a392408b3e8324c69baba0824fe3fd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 13:44:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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 c5d8ea8..face952 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
@@ -18,15 +18,15 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.MapKey;
+import liquibase.pro.packaged.P;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeNode;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.vo.FuncNode;
import java.util.List;
-import java.util.Map;
/**
* 门牌地址表（总台账数据） Mapper 接口
@@ -51,13 +51,13 @@
* 查询区域数据
* @return
*/
- List<TreeNode> getRegionListByGrouyTwon();
+ List<TreeNode> getRegionListByGroupTwon();
/**
* 查询区域数据
* @return
*/
- List<TreeNode> getRegionListByGrouyNei();
+ List<TreeNode> getRegionListByGroupNei();
/**
* 根据社区名称查询小区集合
@@ -89,4 +89,33 @@
* @return
*/
DoorplateAddressVO getDoorplateAddressDetailByCode(@Param("code") String code);
+
+ List<DoorplateAddressVOTree> getTownStreetVOTreeList();
+
+ List<DoorplateAddressVOTree> getNeiVOTreeList(@Param("code") String code);
+
+ List<DoorplateAddressVOTree> getStreetRuVOTreeList(@Param("code") String code);
+
+
+ List<DoorplateAddressVOTree> getDistrictVOTreeList(@Param("code") String code);
+
+ List<DoorplateAddressVOTree> getBuildingVOTreeList(@Param("code") String code);
+
+ /**
+ * 查询街路巷
+ * @param name
+ * @param code
+ * @return
+ */
+ List<TreeNode> getStreetRuList(@Param("name") String name,@Param("code") String code);
+
+ /**
+ * 根据街路巷编号查询街路巷门牌名称集合
+ * @param name 该处当社区编号用
+ * @param code 街路巷编号
+ * @return
+ */
+ List<FuncNode> getDoorplateNameList(@Param("name") String name,@Param("code") String code);
+
+ DoorplateAddressVO getDoorplateAddressDetail(@Param("vo") DoorplateAddressVO doorplateAddressVO);
}
--
Gitblit v1.9.3