From bd92c2ab5b7baee24cb8204a3856c9de188a4f97 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Dec 2023 21:53:18 +0800
Subject: [PATCH] 区域查询修改，场所，房屋，住户，租赁，网格信息区域过滤，机构新增区域字段
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.java | 12 ++
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 5 +
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 9 +
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 2
src/main/java/org/springblade/modules/grid/vo/GridVO.java | 5 +
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 9 +
src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml | 15 ++
src/main/java/org/springblade/modules/house/vo/HouseholdVO.java | 5 +
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 3
src/main/java/org/springblade/modules/system/entity/Dept.java | 6 +
src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java | 11 ++
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 30 +++++
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 10 +
src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java | 9 +
src/main/java/org/springblade/modules/district/vo/DistrictVO.java | 5 +
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java | 9 +
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 9 +
src/main/java/org/springblade/modules/system/service/IRegionService.java | 7 +
src/main/java/org/springblade/modules/system/controller/RegionController.java | 12 ++
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 3
src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml | 16 ++-
src/main/java/org/springblade/modules/grid/vo/GridmanVO.java | 20 +++
src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java | 15 +++
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml | 3
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 4
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 3
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 26 +++++
src/main/java/org/springblade/modules/place/vo/PlaceVO.java | 5
src/main/java/org/springblade/modules/community/vo/CommunityVO.java | 5 +
29 files changed, 261 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml b/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml
index 0b885da..614785d 100644
--- a/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml
+++ b/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml
@@ -23,16 +23,22 @@
<!--自定义分页列表查询-->
<select id="selectCommunityPage" resultType="org.springblade.modules.community.vo.CommunityVO">
- select * from jczz_community
- where is_deleted = 0
+ select
+ jc.*
+ from jczz_community jc
+ left join blade_region br on br.code = jc.code
+ where jc.is_deleted = 0
<if test="community.name !=null and community.name!=''">
- and name like concat('%',#{community.name},'%')
+ and jc.name like concat('%',#{community.name},'%')
</if>
<if test="community.code !=null and community.code!=''">
- and code like concat('%',#{community.code},'%')
+ and jc.code like concat('%',#{community.code},'%')
</if>
<if test="community.streetCode !=null and community.streetCode!=''">
- and street_code like concat('%',#{community.streetCode},'%')
+ and jc.street_code like concat('%',#{community.streetCode},'%')
+ </if>
+ <if test="community.regionCode !=null and community.regionCode !=''">
+ and jc.code like concat('%',#{community.regionCode},'%')
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java b/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
index e9945ce..a93bfd4 100644
--- a/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
+++ b/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
@@ -17,10 +17,14 @@
package org.springblade.modules.community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.vo.CommunityVO;
import org.springblade.modules.community.mapper.CommunityMapper;
import org.springblade.modules.community.service.ICommunityService;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -35,8 +39,15 @@
@Service
public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, CommunityEntity> implements ICommunityService {
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<CommunityVO> selectCommunityPage(IPage<CommunityVO> page, CommunityVO community) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ community.setRegionCode(dept.getRegionCode());
+ }
return page.setRecords(baseMapper.selectCommunityPage(page, community));
}
diff --git a/src/main/java/org/springblade/modules/community/vo/CommunityVO.java b/src/main/java/org/springblade/modules/community/vo/CommunityVO.java
index ad865f3..632b0d0 100644
--- a/src/main/java/org/springblade/modules/community/vo/CommunityVO.java
+++ b/src/main/java/org/springblade/modules/community/vo/CommunityVO.java
@@ -32,4 +32,9 @@
public class CommunityVO extends CommunityEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 区域编号
+ */
+ private String regionCode;
+
}
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 bb36abc..cddcfbf 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -39,6 +39,9 @@
<if test="district.townStreetName !=null and district.townStreetName !=''">
and br.town_name like concat('%',#{district.townStreetName},'%')
</if>
+ <if test="district.regionCode !=null and district.regionCode !=''">
+ and jd.community_code like concat('%',#{district.regionCode},'%')
+ </if>
</select>
<!--小区树查询-->
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 c972fb9..8c8e791 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
@@ -30,6 +30,8 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,8 +51,15 @@
@Autowired
private IGridService gridService;
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<DistrictVO> selectDistrictPage(IPage<DistrictVO> page, DistrictVO district) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ district.setRegionCode(dept.getRegionCode());
+ }
List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district);
// 遍历
for (DistrictVO districtVO : districtVOS) {
diff --git a/src/main/java/org/springblade/modules/district/vo/DistrictVO.java b/src/main/java/org/springblade/modules/district/vo/DistrictVO.java
index b4d6483..ea49d2c 100644
--- a/src/main/java/org/springblade/modules/district/vo/DistrictVO.java
+++ b/src/main/java/org/springblade/modules/district/vo/DistrictVO.java
@@ -56,4 +56,9 @@
private List<String> districtIdList;
+ /**
+ * 区域编号
+ */
+ private String regionCode;
+
}
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
index 2f703b6..ffe17f8 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -20,6 +20,9 @@
<if test="grid.principalPhone!=null and grid.principalPhone!=''">
and principal_phone like concat('%',#{grid.principalPhone},'%')
</if>
+ <if test="grid.regionCode != null and grid.regionCode !='' ">
+ and community_code like concat('%',#{grid.regionCode},'%')
+ </if>
</select>
<!--根据地址编号查询网格数据-->
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
index a8ae1f9..a6ed7cb 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
@@ -20,9 +20,13 @@
<!--自定义分页查询-->
<select id="selectGridmanPage" resultType="org.springblade.modules.grid.vo.GridmanVO">
select
- jgm.*,jg.community_code communityCode
+ jgm.*,
+ jg.grid_name gridName,jg.community_code communityCode,
+ br.name as communityName,
+ br.town_name as townName
from jczz_gridman jgm
left join jczz_grid jg on jg.id = jgm.grid_id and jg.is_deleted = 0
+ left join blade_region br on br.code = jg.community_code
where jgm.is_deleted = 0
<if test="gridman.gridmanName!=null and gridman.gridmanName!=''">
and jgm.gridman_name like concat('%',#{gridman.gridmanName},'%')
@@ -36,6 +40,15 @@
<if test="gridman.communityCode!=null and gridman.communityCode!=''">
and jg.community_code like concat('%',#{gridman.communityCode},'%')
</if>
+ <if test="gridman.communityName!=null and gridman.communityName!=''">
+ and br.name like concat('%',#{gridman.communityName},'%')
+ </if>
+ <if test="gridman.townName!=null and gridman.townName!=''">
+ and br.town_name like concat('%',#{gridman.townName},'%')
+ </if>
+ <if test="gridman.regionCode != null and gridman.regionCode !='' ">
+ and jg.community_code like concat('%',#{gridman.regionCode},'%')
+ </if>
</select>
<!--自定义分页查询-->
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
index ee4c709..43451e2 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -65,6 +65,10 @@
@Override
public IPage<GridVO> selectGridPage(IPage<GridVO> page, GridVO grid) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ grid.setRegionCode(dept.getRegionCode());
+ }
return page.setRecords(baseMapper.selectGridPage(page, grid));
}
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
index e7bed77..3ab8f66 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
@@ -28,8 +28,10 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridmanVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +61,15 @@
@Autowired
private IRegionService regionService;
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<GridmanVO> selectGridmanPage(IPage<GridmanVO> page, GridmanVO gridman) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ gridman.setRegionCode(dept.getRegionCode());
+ }
return page.setRecords(baseMapper.selectGridmanPage(page, gridman));
}
diff --git a/src/main/java/org/springblade/modules/grid/vo/GridVO.java b/src/main/java/org/springblade/modules/grid/vo/GridVO.java
index c64cd20..d50d637 100644
--- a/src/main/java/org/springblade/modules/grid/vo/GridVO.java
+++ b/src/main/java/org/springblade/modules/grid/vo/GridVO.java
@@ -41,4 +41,9 @@
*/
private String townStreetName;
+ /**
+ * 区域编号
+ */
+ private String regionCode;
+
}
diff --git a/src/main/java/org/springblade/modules/grid/vo/GridmanVO.java b/src/main/java/org/springblade/modules/grid/vo/GridmanVO.java
index 7c9f6ff..8c23db8 100644
--- a/src/main/java/org/springblade/modules/grid/vo/GridmanVO.java
+++ b/src/main/java/org/springblade/modules/grid/vo/GridmanVO.java
@@ -36,7 +36,25 @@
/**
* 社区编号
*/
- @ApiModelProperty(value = "社区编号")
private String communityCode;
+ /**
+ * 社区名称
+ */
+ private String communityName;
+
+ /**
+ * 街道名称
+ */
+ private String townName;
+
+ /**
+ * 网格名称
+ */
+ private String gridName;
+
+ /**
+ * 区域编号
+ */
+ private String regionCode;
}
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index a9df469..a12938a 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -166,7 +166,7 @@
<if test="house.room != null and house.room != ''"> and jh.room = #{house.room}</if>
<if test="house.buildingNo != null "> and jh.building_no = #{house.buildingNo}</if>
<if test="house.regionCode != null and house.regionCode !='' ">
- and jda.nei_code like concat('%',#{house.regionCode},'%')
+ and jg.community_code like concat('%',#{house.regionCode},'%')
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
index 765df40..f8cdc45 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -65,6 +65,8 @@
FROM jczz_house_rental jhr
JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
JOIN jczz_house jh ON jh.house_code = jhr.house_code
+ LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
LEFT JOIN (
SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone_number as phone
FROM jczz_household jht RIGHT JOIN (
@@ -124,6 +126,9 @@
<if test="vo.startTime != null and vo.startTime != '' and vo.endTime != null and vo.endTime != '' ">
AND jhr.create_time BETWEEN #{vo.startTime} and #{vo.endTime}
</if>
+ <if test="vo.regionCode!=null and vo.regionCode!=''">
+ and jg.community_code like concat('%',#{vo.regionCode},'%')
+ </if>
<include refid="filterHouseGrid"/>
</select>
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index f087569..effa372 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -189,6 +189,9 @@
<if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
</if>
+ <if test="household.regionCode!=null and household.regionCode!=''">
+ and jg.community_code like concat('%',#{household.regionCode},'%')
+ </if>
order by jh.create_time desc
</select>
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index d9552a8..fed0dec 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -33,7 +33,9 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,6 +62,9 @@
@Autowired
private IGridService gridService;
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义分页查询
* @param page
@@ -68,6 +73,10 @@
*/
@Override
public IPage<HouseRentalTenantVO> selectHouseRentalPage(IPage<HouseRentalTenantVO> page, HouseRentalTenantVO houseRental) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ houseRental.setRegionCode(dept.getRegionCode());
+ }
List<String> list = new ArrayList<>();
if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
if (houseRental.getRoleName().equals("网格员")){
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 9953e71..115c716 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -45,6 +45,8 @@
import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -71,8 +73,15 @@
@Autowired
private IGridRangeService gridRangeService;
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ house.setRegionCode(dept.getRegionCode());
+ }
List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house);
// 遍历查询网格
for (HouseVO houseVO : houseVOS) {
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 0ed19f7..0175064 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -30,8 +30,10 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,13 +61,19 @@
@Autowired
private IUserService userService;
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
// doInsert();
// 执行业务等
-
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ household.setRegionCode(dept.getRegionCode());
+ }
List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household);
// 遍历
// for (HouseholdVO householdVO : householdVOS) {
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java b/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
index a6280f2..3212edf 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
@@ -41,5 +41,20 @@
*/
private Integer status;
+ /**
+ * 区域编号
+ */
+ private String regionCode;
+
+ /**
+ * 开始时间
+ */
+ private String startTime;
+
+ /**
+ * 结束时间
+ */
+ private String endTime;
+
}
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
index 0a711c9..456b08f 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -65,6 +65,11 @@
private String gridName;
/**
+ * 区域编号
+ */
+ private String regionCode;
+
+ /**
* 标签
*/
private List<HouseholdLabelVO> householdLabelList = new ArrayList<>();
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 0c9671d..70d61d8 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -90,6 +90,9 @@
and bu.real_name != ""
and bu.phone != ""
</if>
+ <if test="place.regionCode != null and place.regionCode !='' ">
+ and jg.community_code like concat('%',#{place.regionCode},'%')
+ </if>
order by jpe.create_time desc
</select>
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index b77f501..07a85ad 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -40,7 +40,9 @@
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -81,6 +83,9 @@
@Autowired
private IGridmanService gridmanService;
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义列表查询
* @param page
@@ -89,6 +94,10 @@
*/
@Override
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ place.setRegionCode(dept.getRegionCode());
+ }
List<String> list = new ArrayList<>();
if (null!=place.getRoleName() && !place.getRoleName().equals("")){
if (place.getRoleName().equals("网格员")){
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
index fae4cc9..71407d1 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -103,5 +103,8 @@
*/
private String gridName;
-
+ /**
+ * 区域编号
+ */
+ private String regionCode;
}
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 6c5e556..ef5bc77 100644
--- a/src/main/java/org/springblade/modules/system/controller/RegionController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -124,6 +124,18 @@
return R.data(regionService.getTree(parentCode));
}
+
+ /**
+ * 树列表(获取当前树）
+ * @param code
+ * @return
+ */
+ @GetMapping("/getTownTree")
+ @ApiOperation(value = "树列表", notes = "传入menu")
+ public R getTownTree(String code) {
+ return R.data(regionService.getTownTree(code));
+ }
+
/**
* 新增 行政区划表
*/
diff --git a/src/main/java/org/springblade/modules/system/entity/Dept.java b/src/main/java/org/springblade/modules/system/entity/Dept.java
index e061240..a70149d 100644
--- a/src/main/java/org/springblade/modules/system/entity/Dept.java
+++ b/src/main/java/org/springblade/modules/system/entity/Dept.java
@@ -86,6 +86,12 @@
private Integer deptCategory;
/**
+ * 管辖区域编号
+ */
+ @ApiModelProperty(value = "管辖区域编号")
+ private String regionCode;
+
+ /**
* 排序
*/
@ApiModelProperty(value = "排序")
diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
index 2afc454..e4cfed7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
@@ -64,8 +64,18 @@
/**
* 树列表
* @param parentCode
+ * @param regionCode
* @return
*/
@MapKey(value = "id")
- Map<String, TreeStringNode> getTreeList(@Param("parentCode") String parentCode);
+ Map<String, TreeStringNode> getTreeList(@Param("parentCode") String parentCode,
+ @Param("regionCode") String regionCode);
+
+ /**
+ * 树列表(获取当前树）
+ * @param regionCode
+ * @return
+ */
+ @MapKey(value = "id")
+ Map<String, TreeStringNode> getTownTree(@Param("regionCode") String regionCode);
}
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 70fd56c..9180812 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -112,6 +112,32 @@
<if test="parentCode!=null">
and parent_code = #{parentCode}
</if>
+ <if test="regionCode!=null and regionCode!=''">
+ and parent_code = #{regionCode}
+ </if>
+ </select>
+
+ <!--根据当前编号查询-->
+ <select id="getTownTree" resultType="org.springblade.common.node.TreeStringNode">
+ SELECT
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region where district_code = '361102'
+ and region_level = 4
+ <if test="regionCode!=null and regionCode!=''">
+ and code = #{regionCode}
+ </if>
+ union
+ SELECT
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region where district_code = '361102'
+ and region_level = 4
+ <if test="regionCode!=null and regionCode!=''">
+ and parent_code = #{regionCode}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IRegionService.java b/src/main/java/org/springblade/modules/system/service/IRegionService.java
index af578a8..953b27b 100644
--- a/src/main/java/org/springblade/modules/system/service/IRegionService.java
+++ b/src/main/java/org/springblade/modules/system/service/IRegionService.java
@@ -91,4 +91,11 @@
* @return
*/
List<TreeStringNode> getTree(String parentCode);
+
+ /**
+ * 树列表(获取当前树）
+ * @param code
+ * @return
+ */
+ List<TreeStringNode> getTownTree(String code);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
index 29f0e11..30cd13c 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
@@ -23,14 +23,19 @@
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
+import org.springblade.modules.district.vo.DistrictVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.excel.RegionExcel;
import org.springblade.modules.system.mapper.RegionMapper;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.vo.RegionVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -46,6 +51,9 @@
*/
@Service
public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements IRegionService {
+
+ @Autowired
+ private IDeptService deptService;
@Override
public boolean submit(Region region) {
@@ -127,6 +135,26 @@
*/
@Override
public List<TreeStringNode> getTree(String parentCode) {
- return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(parentCode));
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ String regionCode = null;
+ if (null!=dept){
+ regionCode = dept.getRegionCode();
+ }
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(parentCode,regionCode));
+ }
+
+ /**
+ * 树列表(获取当前树）
+ * @param code
+ * @return
+ */
+ @Override
+ public List<TreeStringNode> getTownTree(String code) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ String regionCode = null;
+ if (null!=dept){
+ regionCode = dept.getRegionCode();
+ }
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
}
}
--
Gitblit v1.9.3