From 23ee61424846639ee5c0e001aa5977b4c392d324 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 02 Nov 2023 09:53:08 +0800
Subject: [PATCH] 小区商铺查询修改
---
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
index 3e5768f..6fc23bd 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -25,13 +25,18 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
+import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.wrapper.DoorplateAddressWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
/*
* 门牌地址表（总台账数据） 控制器
*
@@ -121,7 +126,7 @@
/**
* 根据角色获取功能集合数据
- * @param type
+ * @param type 1：查社区 2：查场所 3：查房屋
* @param roleName
* @return
*/
@@ -138,8 +143,8 @@
* @return
*/
@GetMapping("/getHousesList")
- public R getHousesList(String name,String code,Integer type) {
- return R.data(doorplateAddressService.getHousesList(name,code,type));
+ public R getHousesList(String name,String code,Integer type,Integer addressType) {
+ return R.data(doorplateAddressService.getHousesList(name,code,type,addressType));
}
/**
@@ -152,5 +157,12 @@
return R.data(doorplateAddressService.getHouseRentInfo(code));
}
+ @GetMapping("/getDoorplateAddressList")
+ public R<List<DoorplateAddressVOTree>> getDoorplateAddressList(String code, String type){
+ List<DoorplateAddressVOTree> list = doorplateAddressService.getDoorplateAddressList(code,type);
+ return R.data(list);
+ }
+
+
}
--
Gitblit v1.9.3