From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:30:14 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 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 5239ad7..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
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -170,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()));
+ }
+
/**
* 分页查询房屋列表
*
@@ -189,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;
@@ -513,4 +521,21 @@
return R.ok();
}
+ @Override
+ @Transactional
+ public R insertHouse(ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO) {
+ ComMngPopulationHouseDO houseDO=new ComMngPopulationHouseDO();
+ BeanUtils.copyProperties(houseEditAdminDTO, houseDO);
+ houseDO.setCreateAt(new Date());
+ if (this.baseMapper.insert(houseDO) > 0) {
+ ComMngPopulationHouseUserDO comMngPopulationHouseUserDO=new ComMngPopulationHouseUserDO();
+ comMngPopulationHouseUserDO.setHouseId(houseDO.getId());
+ comMngPopulationHouseUserDO.setPopulId(houseEditAdminDTO.getPopulationId());
+ comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
+ return R.ok();
+ } else {
+ return R.fail();
+ }
+ }
+
}
--
Gitblit v1.7.1