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/service/impl/DoorplateAddressServiceImpl.java | 74 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 9973c01..4f2e462 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -16,27 +16,32 @@
*/
package org.springblade.modules.doorplateAddress.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.node.TreeNode;
-import org.springblade.common.utils.NodeTreeUtil;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
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.vo.FuncNode;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseholdLabelService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseRentalVO;
+import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.service.IPlaceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -78,9 +83,9 @@
// 如果是网格管理员，系统管理员
if (type==1){
// 查询街道
- List<TreeNode> townList = baseMapper.getRegionListByGrouyTwon();
+ List<TreeNode> townList = baseMapper.getRegionListByGroupTwon();
// 查询社区
- List<TreeNode> neiList = baseMapper.getRegionListByGrouyNei();
+ List<TreeNode> neiList = baseMapper.getRegionListByGroupNei();
TreeNode node = townList.get(0);
node.setHasChildren(true);
// 遍历
@@ -117,22 +122,35 @@
* @return
*/
@Override
- public Object getHousesList(String name, String code, Integer type) {
+ public Object getHousesList(String name, String code, Integer type,Integer addressType) {
List<TreeNode> list = new ArrayList<>();
// 查小区，场所
if (type==1){
// 根据社区名称查询小区集合
list = baseMapper.getDistrictList(name,code);
}
- // 查楼栋，场所
+ // 查楼栋，街路巷
if (type==2){
- // 根据社区名称查询楼栋集合
- list = baseMapper.getBuildingList(name,code);
+ // 判断 code 长度，如果 code 长度大于 12 则为小区查楼栋，否则则按社区查街路巷
+ if (code.length()>12){
+ // 根据社区名称查询楼栋集合
+ list = baseMapper.getBuildingList(name, code);
+ }else {
+ // 查询街路巷
+ list = baseMapper.getStreetRuList(name, code);
+ }
}
// 查户室
if (type==3){
- // 查询户室及住户相关信息，单元中包含住户
- return getUnitHouseholdList(name,code);
+ // 判断地址类型
+ if (addressType==1) {
+ // 查询户室及住户相关信息，单元中包含住户
+ return getUnitHouseholdList(name, code);
+ }
+ if (addressType==2) {
+ // 根据街路巷编号查询街路巷门牌名称集合
+ return baseMapper.getDoorplateNameList(name,code);
+ }
}
return list;
}
@@ -175,11 +193,39 @@
public Object getHouseRentInfo(String code) {
// 先查询门牌信息
DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
- // 查询房屋出租情况
- List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
- // 设置数据
- doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+ if(null!= doorplateAddressDetailVO) {
+ // 查询房屋出租情况
+ List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
+ // 查询房屋人员情况
+ List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(code);
+ // 设置数据
+ doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+ doorplateAddressDetailVO.setHouseholdList(householdVOS);
+ }
// 返回
return doorplateAddressDetailVO;
}
+
+ @Override
+ public List<DoorplateAddressVOTree> getDoorplateAddressList(String code, String type) {
+
+ //西市街道 万达社区 滨江西路66号 万达华府 26栋
+ List<DoorplateAddressVOTree> list = new ArrayList<>();
+
+
+ if (type.equals("townStreet")){
+ //获取所有街道街道
+ list = baseMapper.getTownStreetVOTreeList();
+ }else if (type.equals("nei")){
+ list= baseMapper.getNeiVOTreeList(code);
+ }else if (type.equals("streetRu")){
+ list = baseMapper.getStreetRuVOTreeList(code);
+ }else if (type.equals("district")){
+ list=baseMapper.getDistrictVOTreeList(code);
+ }else if (type.equals("building")){
+ list = baseMapper.getBuildingVOTreeList(code);
+ }
+
+ return list;
+ }
}
--
Gitblit v1.9.3