From c59eeba06fa3ff353cd7c9016aa0a0b25a6931a5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 04 Jan 2024 18:16:06 +0800
Subject: [PATCH] 商超查询，房屋查询，场所查询修改
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 2 ++
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 2 +-
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 25 ++++++++++++++++++++++++-
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 6 ++++++
5 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index aa4de06..6aae2fb 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -424,6 +424,8 @@
<!--查询商超详情集合-->
<select id="getPlaceRelDetailList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
select jp.id as addressCode,
+ jpl.grid_name as unitName,
+ jpl.community_code as unitCode,
doorplate_num as floor,
4 as addressType
from jczz_place_rel jpl
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 703f7dc..3b2f91b 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
@@ -327,8 +327,31 @@
getGridInfoByGridman(houseParam);
// 查询商超
List<FuncNode> doorplateNameList = baseMapper.getPlaceRelDetailList(houseParam);
+ // 按单元(网格)分组
+ Map<String, List<FuncNode>> listMap = doorplateNameList.stream().collect(Collectors.groupingBy(FuncNode::getUnitName));
+ //
+ List<FuncNode> tempList = new ArrayList<>();
+ // 遍历
+ listMap.forEach((s, temps) -> {
+ FuncNode funcNode = new FuncNode();
+ funcNode.setUnitName(s);
+ funcNode.setAddressType(4);
+ funcNode.setUnitCode(temps.get(0).getUnitCode());
+ funcNode.setChildren(temps);
+ // 查询网格对应的排序
+ QueryWrapper<GridEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("community_code",funcNode.getUnitCode()).eq("grid_name",funcNode.getUnitName());
+ // 查询网格
+ GridEntity one = gridService.getOne(wrapper);
+ if (null!=one){
+ funcNode.setSort(one.getSort());
+ }
+ tempList.add(funcNode);
+ });
+ // 排序
+ List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getSort())).collect(Collectors.toList());
map.put("aoiList",new ArrayList<>());
- map.put("shopList",doorplateNameList);
+ map.put("shopList",sortList);
// 返回
return map;
}
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 5614cc5..502c132 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -246,7 +246,7 @@
select
jh.id,jh.house_code,jh.name,jh.phone_number,jh.associated_user_id,
jh.role_type,jh.associated_user_name,jh.relationship,jh.is_primary_contact,
- jh.residential_status,jh.gender,jh.birthday,jh.id_card,jh.hkmt_pass,jh.passport,
+ jh.residential_status,jh.gender,jh.birthday,jh.id_card,jh.card_type,jh.hkmt_pass,jh.passport,
jh.ethnicity,jh.education,jh.resident_type,
jh.hukou_registration,jh.resident_adcode,jh.native_place_adcode,
jh.religious_belief,jh.health_status,jh.disease_name,
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 e127388..c4de6e3 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
@@ -213,6 +213,12 @@
User userParams = new User();
userParams.setPhone(householdEntity.getPhoneNumber());
User user = userService.getOne(Condition.getQueryWrapper(userParams));
+ if (null==user) {
+ User userParams1 = new User();
+ userParams1.setAccount(householdEntity.getPhoneNumber());
+ userParams1.setIsDeleted(0);
+ user = userService.getOne(Condition.getQueryWrapper(userParams1));
+ }
if (null!=user) {
//如果用户存在，则该用户id绑定场所
householdEntity.setAssociatedUserId(user.getId());
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 6926e4c..03700c7 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
@@ -545,7 +545,7 @@
List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
if (list.size() > 0) {
placeVO.setDoorplateAddressEntity(list.get(0));
- placeVO.setNeiCode(list.get(0).getNeiCode().replaceAll("0+$", ""));
+ placeVO.setNeiCode(list.get(0).getNeiCode());
}
// 查询网格数据
GridVO gridVO = gridService.getGridDetailByHouseCode(place.getHouseCode());
--
Gitblit v1.9.3