From 8a28bb397d5743edf1da5930db0d6d0fdd86b35e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java | 19 ++++
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml | 13 +++
src/main/java/org/springblade/modules/district/controller/DistrictController.java | 8 ++
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java | 10 ++
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java | 11 ++
src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java | 15 ++-
src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java | 10 ++
src/main/java/org/springblade/modules/system/controller/RegionController.java | 9 +
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 13 ++-
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.java | 11 ++
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml | 18 ++++
src/main/java/org/springblade/modules/place/entity/PlaceEntity.java | 6 +
src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java | 2
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 19 +---
src/main/java/org/springblade/modules/house/entity/HouseEntity.java | 5 +
src/main/java/org/springblade/modules/district/service/IDistrictService.java | 6 +
src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java | 2
src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java | 15 ++-
src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java | 6 +
19 files changed, 156 insertions(+), 42 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/controller/DistrictController.java b/src/main/java/org/springblade/modules/district/controller/DistrictController.java
index c4785d9..322561c 100644
--- a/src/main/java/org/springblade/modules/district/controller/DistrictController.java
+++ b/src/main/java/org/springblade/modules/district/controller/DistrictController.java
@@ -122,5 +122,13 @@
return R.status(districtService.removeByIds(Func.toStrList(ids)));
}
+ /**
+ * 获取小区树
+ */
+ @GetMapping("/getDistrictTree")
+ public R getDistrictTree(DistrictVO district) {
+ return R.data(districtService.getDistrictTree(district));
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java
index f4a6b65..b315152 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java
@@ -16,12 +16,15 @@
*/
package org.springblade.modules.district.mapper;
+import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
+import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.vo.DistrictVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
/**
* 小区表 Mapper 接口
@@ -39,4 +42,11 @@
*/
List<DistrictVO> selectDistrictPage(IPage page,@Param("district") DistrictVO district);
+ /**
+ * 获取小区树
+ * @param district
+ * @return
+ */
+ @MapKey(value = "id")
+ Map<String, TreeStringNode> getDistrictTree(@Param("district") DistrictVO district);
}
diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
index ed612c5..dc5e2cc 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -31,5 +31,23 @@
</if>
</select>
+ <!--自定义分页-->
+ <select id="getDistrictTree" resultType="org.springblade.common.node.TreeStringNode">
+ SELECT
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region where district_code = '361102'
+ union all
+ (
+ select
+ id,
+ community_code as parentId,
+ name
+ from jczz_district
+ where is_deleted = 0
+ )
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/district/service/IDistrictService.java b/src/main/java/org/springblade/modules/district/service/IDistrictService.java
index 88a43fc..f45ad2f 100644
--- a/src/main/java/org/springblade/modules/district/service/IDistrictService.java
+++ b/src/main/java/org/springblade/modules/district/service/IDistrictService.java
@@ -40,4 +40,10 @@
IPage<DistrictVO> selectDistrictPage(IPage<DistrictVO> page, DistrictVO district);
+ /**
+ * 获取小区树
+ * @param district
+ * @return
+ */
+ Object getDistrictTree(DistrictVO district);
}
diff --git a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
index 24d2178..9cc3a94 100644
--- a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -17,6 +17,7 @@
package org.springblade.modules.district.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.vo.DistrictVO;
import org.springblade.modules.district.mapper.DistrictMapper;
@@ -39,5 +40,13 @@
return page.setRecords(baseMapper.selectDistrictPage(page, district));
}
-
+ /**
+ * 获取小区树
+ * @param district
+ * @return
+ */
+ @Override
+ public Object getDistrictTree(DistrictVO district) {
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getDistrictTree(district));
+ }
}
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
index bb8daf8..25986b1 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
@@ -125,6 +125,11 @@
*/
@ApiModelProperty(value = "图片URLS")
private String imageUrls;
+ /**
+ * 网格id
+ */
+ @ApiModelProperty(value = "网格id")
+ private Integer gridId;
/**
* 创建人
diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
index 1008970..71befe4 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -98,6 +98,12 @@
private String imageUrls;
/**
+ * 网格id
+ */
+ @ApiModelProperty(value = "网格id")
+ private Integer gridId;
+
+ /**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
index 064dbc5..00d7fd4 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
@@ -119,7 +119,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCapitalApplyService.removeByIds(Func.toLongList(ids)));
+ return R.status(propertyCapitalApplyService.removeByIds(Func.toIntList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
index fc90837..b801321 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
@@ -83,6 +83,14 @@
}
/**
+ * 物业公司列表查询（不分页）
+ */
+ @GetMapping("/getPropertyCompanyList")
+ public R getPropertyCompanyList(PropertyCompanyVO propertyCompany) {
+ return R.data(propertyCompanyService.getPropertyCompanyList(propertyCompany));
+ }
+
+ /**
* 物业公司 新增
*/
@PostMapping("/save")
@@ -119,7 +127,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCompanyService.removeByIds(Func.toLongList(ids)));
+ return R.status(propertyCompanyService.removeByIds(Func.toIntList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
index 53b204e..86c5c0a 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
@@ -119,7 +119,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCompanyDistrictService.removeByIds(Func.toLongList(ids)));
+ return R.status(propertyCompanyDistrictService.removeByIds(Func.toIntList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index f03796e..eb0dca5 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.property.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -109,11 +106,15 @@
* 预计开工时间
*/
@ApiModelProperty(value = "预计开工时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date runTime;
/**
* 预计竣工时间
*/
@ApiModelProperty(value = "预计竣工时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date completedTime;
/**
* 项目摘要
@@ -136,6 +137,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private String createUser;
/**
@@ -143,6 +145,7 @@
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
@ApiModelProperty("创建时间")
private Date createTime;
@@ -151,6 +154,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
@@ -158,6 +162,7 @@
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty("更新时间")
private Date updateTime;
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
index d93ffa2..5f9325a 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.property.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -29,8 +26,6 @@
import java.io.Serializable;
import java.util.Date;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -97,11 +92,15 @@
* 合同开始时间
*/
@ApiModelProperty(value = "合同开始时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/**
* 合同结束时间
*/
@ApiModelProperty(value = "合同结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
/**
* 简介
@@ -114,6 +113,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private String createUser;
/**
@@ -122,6 +122,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -129,6 +130,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
@@ -137,6 +139,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
index 516839c..e9a12a2 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.property.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -72,17 +69,17 @@
* 省编号
*/
@ApiModelProperty(value = "省编号")
- private String provinceCode;
+ private String province;
/**
* 市编号
*/
@ApiModelProperty(value = "市编号")
- private String cityCode;
+ private String city;
/**
* 区县编号
*/
@ApiModelProperty(value = "区县编号")
- private String countyCode;
+ private String area;
/**
* 简介
*/
@@ -94,6 +91,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private String createUser;
/**
@@ -102,6 +100,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -109,6 +108,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
@@ -117,6 +117,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.java b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.java
index bfab8a3..f763c69 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.java
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.vo.PropertyCompanyVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,13 @@
* @param propertyCompany
* @return
*/
- List<PropertyCompanyVO> selectPropertyCompanyPage(IPage page, PropertyCompanyVO propertyCompany);
+ List<PropertyCompanyVO> selectPropertyCompanyPage(IPage page,
+ @Param("propertyCompany") PropertyCompanyVO propertyCompany);
-
+ /**
+ * 物业公司列表查询（不分页）
+ * @param propertyCompany
+ * @return
+ */
+ List<PropertyCompanyVO> getPropertyCompanyList(@Param("propertyCompany") PropertyCompanyVO propertyCompany);
}
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
index 756ead4..665ace0 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
@@ -19,9 +19,20 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
+ <!--自定义分页查询-->
<select id="selectPropertyCompanyPage" resultMap="propertyCompanyResultMap">
select * from jczz_property_company where is_deleted = 0
+ <if test="propertyCompany.name!=null and propertyCompany.name!=''">
+ and name like concat('%',#{propertyCompany.name},'%')
+ </if>
+ </select>
+
+ <!--物业公司列表查询（不分页）-->
+ <select id="getPropertyCompanyList" resultMap="propertyCompanyResultMap">
+ select * from jczz_property_company where is_deleted = 0
+ <if test="propertyCompany.name!=null and propertyCompany.name!=''">
+ and name like concat('%',#{propertyCompany.name},'%')
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
index b15a7a7..56fbdcf 100644
--- a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
+++ b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
@@ -40,4 +40,10 @@
IPage<PropertyCompanyVO> selectPropertyCompanyPage(IPage<PropertyCompanyVO> page, PropertyCompanyVO propertyCompany);
+ /**
+ * 物业公司列表查询（不分页）
+ * @param propertyCompany
+ * @return
+ */
+ Object getPropertyCompanyList(PropertyCompanyVO propertyCompany);
}
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
index 1da4a90..5cbb1c8 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
@@ -25,6 +25,8 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
/**
* 物业公司 服务实现类
*
@@ -34,10 +36,25 @@
@Service
public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMapper, PropertyCompanyEntity> implements IPropertyCompanyService {
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param propertyCompany
+ * @return
+ */
@Override
public IPage<PropertyCompanyVO> selectPropertyCompanyPage(IPage<PropertyCompanyVO> page, PropertyCompanyVO propertyCompany) {
return page.setRecords(baseMapper.selectPropertyCompanyPage(page, propertyCompany));
}
-
+ /**
+ * 物业公司列表查询（不分页）
+ * @param propertyCompany
+ * @return
+ */
+ @Override
+ public List<PropertyCompanyVO> getPropertyCompanyList(PropertyCompanyVO propertyCompany) {
+ return baseMapper.getPropertyCompanyList(propertyCompany);
+ }
}
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 d975204..6c5e556 100644
--- a/src/main/java/org/springblade/modules/system/controller/RegionController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.system.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -170,8 +171,12 @@
@GetMapping("/select")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "下拉数据源", notes = "传入tenant")
- public R<List<Region>> select(@RequestParam(required = false, defaultValue = "00") String code) {
- List<Region> list = regionService.list(Wrappers.<Region>query().lambda().eq(Region::getParentCode, code));
+ public R<List<Region>> select(@RequestParam(required = false, defaultValue = "00") String code,Integer level) {
+ LambdaQueryWrapper<Region> wrapper = Wrappers.<Region>query().lambda().eq(Region::getParentCode, code);
+ if (null!=level){
+ wrapper.eq(Region::getRegionLevel,level);
+ }
+ List<Region> list = regionService.list(wrapper);
return R.data(list);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
index f7c96a2..34821a1 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -105,21 +105,10 @@
<!--根据父编号查询所有的下级-->
<select id="getTreeList" resultType="org.springblade.common.node.TreeStringNode">
SELECT
- br.code as id,br.parent_code as parentId,br.name as name
- FROM
- (
- SELECT
- @ids AS ids,
- ( SELECT @ids := GROUP_CONCAT( code ) FROM blade_region WHERE FIND_IN_SET( parent_code, @ids ) ) AS cids
- FROM
- blade_region
- WHERE
- @ids IS NOT NULL
- AND @ids := #{parentCode}
- ) id,
- blade_region br
- WHERE
- FIND_IN_SET(br.parent_code,ids)
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region where district_code = '361102'
</select>
</mapper>
--
Gitblit v1.9.3