From 3f50420b42259a88f7e623b16c14b00f52071f4c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 九月 2021 17:30:24 +0800
Subject: [PATCH] Merge branch 'test' into test_bak
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 c67b70e..f1c206c 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
@@ -171,6 +171,11 @@
return R.ok(this.comMngPopulationDAO.getSecondHouseAddress(cascadeHouseDTO.getCommunityId()));
}
+ @Override
+ public R getSecondHouse(CascadeHouseDTO cascadeHouseDTO) {
+ return R.ok(this.comMngPopulationDAO.getSecondHouse(cascadeHouseDTO.getCommunityId()));
+ }
+
/**
* 分页查询房屋列表
*
@@ -190,25 +195,27 @@
break;
case 2:
populationHouseAdminDTO.setRoad(houseDO.getAlley());
- populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
+// populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
break;
case 3:
populationHouseAdminDTO.setRoad(houseDO.getAlley());
populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
- populationHouseAdminDTO.setFloor(houseDO.getFloor());
+// populationHouseAdminDTO.setFloor(houseDO.getFloor());
break;
case 4:
populationHouseAdminDTO.setRoad(houseDO.getAlley());
populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
populationHouseAdminDTO.setFloor(houseDO.getFloor());
- populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
+// populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
break;
case 5:
populationHouseAdminDTO.setRoad(houseDO.getAlley());
populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
populationHouseAdminDTO.setFloor(houseDO.getFloor());
populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
- populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo());
+ if(populationHouseAdminDTO.getLevelIsAll() == null){
+ populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo());
+ }
break;
default:
break;
--
Gitblit v1.7.1