From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/system/controller/RegionController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/RegionController.java b/src/main/java/org/springblade/modules/system/controller/RegionController.java
index 1a427e3..3860f74 100644
--- a/src/main/java/org/springblade/modules/system/controller/RegionController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -35,6 +35,7 @@
import org.springblade.modules.system.excel.RegionExcel;
import org.springblade.modules.system.excel.RegionImporter;
import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.system.vo.RegionParamVO;
import org.springblade.modules.system.vo.RegionVO;
import org.springblade.modules.system.wrapper.RegionWrapper;
import org.springframework.web.bind.annotation.*;
@@ -115,6 +116,7 @@
/**
* 树列表(包含省市县三级)
+ *
* @return
*/
@GetMapping("/getBaseTree")
@@ -124,18 +126,29 @@
/**
* 树列表
+ *
* @param region
* @return
*/
@GetMapping("/tree")
@ApiOperation(value = "树列表", notes = "传入menu")
- public R getTree(RegionVO region) {
+ public R getTree(RegionParamVO region) {
return R.data(regionService.getTree(region));
}
+ /**
+ * 树列表-查询到社区的树
+ * @return
+ */
+ @GetMapping("/treeToCommunity")
+ @ApiOperation(value = "树列表-查询到社区的树", notes = "传入menu")
+ public R treeToCommunity(@RequestParam(value = "isFiter",required = false) String isFiter) {
+ return R.data(regionService.treeToCommunity(isFiter));
+ }
/**
* 树列表(获取当前树）
+ *
* @param code
* @return
*/
@@ -192,10 +205,10 @@
@GetMapping("/select")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "下拉数据源", notes = "传入tenant")
- public R<List<Region>> select(@RequestParam(required = false, defaultValue = "00") String code,Integer level) {
+ public R<List<Region>> select(@RequestParam(required = false, defaultValue = "000000000000") String code, Integer level) {
LambdaQueryWrapper<Region> wrapper = Wrappers.<Region>query().lambda().eq(Region::getParentCode, code);
- if (null!=level){
- wrapper.eq(Region::getRegionLevel,level);
+ if (null != level) {
+ wrapper.eq(Region::getRegionLevel, level);
}
List<Region> list = regionService.list(wrapper);
return R.data(list);
--
Gitblit v1.9.3