From eb80b83a3d4a0b59325e90405dc6c687c2904d3a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 05 一月 2022 14:45:16 +0800
Subject: [PATCH] 商家后台相关代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
index 9d56dfc..a1ce6e8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
@@ -99,9 +99,8 @@
cascadeHouseVOList = this.baseMapper.getHouseLevelByAlley(cascadeHouseDTO.getCommunityId(),
cascadeHouseDTO.getVillageId());
cascadeHouseVOList = cascadeHouseVOList.stream()
- .collect(Collectors.collectingAndThen(
- Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley()))),
- ArrayList::new));
+ .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
+ Comparator.comparing(ComMngCascadeHouseVO::getAlley))),ArrayList::new));
cascadeHouseVOList.forEach(cascade -> {
cascade.setName(cascade.getAlley());
});
@@ -435,8 +434,8 @@
// subordinateList =
// subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new
// TreeSet<>(Comparator.comparing(o -> o.getFloor()))), ArrayList::new));
- subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getFloor))
- .collect(Collectors.toList());
+// subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getFloor))
+// .collect(Collectors.toList());
subordinateList.forEach(cascade -> {
if (cascade.getFloor().contains("栋")) {
cascade.setName(cascade.getFloor());
@@ -449,8 +448,8 @@
if (houseDO != null) {
subordinateList =
this.baseMapper.getHouseLevelByUnitNos(houseDO.getVillageId(), houseDO.getFloor());
- subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getUnitNo))
- .collect(Collectors.toList());
+// subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getUnitNo))
+// .collect(Collectors.toList());
// subordinateList =
// subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new
// TreeSet<>(Comparator.comparing(o -> o.getUnitNo()))), ArrayList::new));
@@ -467,8 +466,8 @@
if (houseDO != null) {
subordinateList = this.baseMapper.getHouseLevelByHouseNos(houseDO.getVillageId(),
houseDO.getFloor(), houseDO.getUnitNo());
- subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getHouseNo))
- .collect(Collectors.toList());
+// subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getHouseNo))
+// .collect(Collectors.toList());
// subordinateList =
// subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new
// TreeSet<>(Comparator.comparing(o -> o.getHouseNo()))), ArrayList::new));
--
Gitblit v1.7.1