bug修改。
This commit is contained in:
parent
99fdd602de
commit
e6b58c914b
@ -118,7 +118,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui
|
|||||||
}
|
}
|
||||||
cityBuildingDao.saveCityBuilding(params);
|
cityBuildingDao.saveCityBuilding(params);
|
||||||
// 自动生成楼宇内的房屋信息
|
// 自动生成楼宇内的房屋信息
|
||||||
saveHouse(cityBuildingId, cityBuildingVO, null, "save");
|
saveHouse(cityBuildingId, cityBuildingVO, null, "save", token);
|
||||||
return cityBuildingId;
|
return cityBuildingId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -270,7 +270,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui
|
|||||||
Integer newFloor = Integer.valueOf(cityBuildingVO.getBuildingFloor());
|
Integer newFloor = Integer.valueOf(cityBuildingVO.getBuildingFloor());
|
||||||
if(newFloor > oldFloor) {
|
if(newFloor > oldFloor) {
|
||||||
removeValue = Integer.valueOf(cityBuildingVO.getBuildingFloor());
|
removeValue = Integer.valueOf(cityBuildingVO.getBuildingFloor());
|
||||||
saveHouse(cityBuildingId, cityBuildingVO, cityBuildingDTO, "buildingFloor");
|
saveHouse(cityBuildingId, cityBuildingVO, cityBuildingDTO, "buildingFloor", token);
|
||||||
}else {
|
}else {
|
||||||
String buildingNum = cityBuildingVO.getBuildingNum();
|
String buildingNum = cityBuildingVO.getBuildingNum();
|
||||||
Integer unitNum = Integer.valueOf(cityBuildingDTO.getBuildingUnitNum());
|
Integer unitNum = Integer.valueOf(cityBuildingDTO.getBuildingUnitNum());
|
||||||
@ -293,7 +293,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui
|
|||||||
Integer newCount = Integer.valueOf(cityBuildingVO.getCountOfFloor());
|
Integer newCount = Integer.valueOf(cityBuildingVO.getCountOfFloor());
|
||||||
if(newCount > oldCount) {
|
if(newCount > oldCount) {
|
||||||
removeValue = Integer.valueOf(cityBuildingVO.getCountOfFloor());
|
removeValue = Integer.valueOf(cityBuildingVO.getCountOfFloor());
|
||||||
saveHouse(cityBuildingId, cityBuildingVO, cityBuildingDTO, "countOfFloor");
|
saveHouse(cityBuildingId, cityBuildingVO, cityBuildingDTO, "countOfFloor", token);
|
||||||
}else {
|
}else {
|
||||||
String buildingNum = cityBuildingVO.getBuildingNum();
|
String buildingNum = cityBuildingVO.getBuildingNum();
|
||||||
Integer unitNum = Integer.valueOf(cityBuildingDTO.getBuildingUnitNum());
|
Integer unitNum = Integer.valueOf(cityBuildingDTO.getBuildingUnitNum());
|
||||||
@ -316,7 +316,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui
|
|||||||
Integer newUnitNum = Integer.valueOf(cityBuildingVO.getBuildingUnitNum());
|
Integer newUnitNum = Integer.valueOf(cityBuildingVO.getBuildingUnitNum());
|
||||||
if(newUnitNum > oldUnitNum) {
|
if(newUnitNum > oldUnitNum) {
|
||||||
removeValue =Integer.valueOf(cityBuildingVO.getBuildingUnitNum());
|
removeValue =Integer.valueOf(cityBuildingVO.getBuildingUnitNum());
|
||||||
saveHouse(cityBuildingId, cityBuildingVO, cityBuildingDTO, "buildingUnitNum");
|
saveHouse(cityBuildingId, cityBuildingVO, cityBuildingDTO, "buildingUnitNum", token);
|
||||||
}else {
|
}else {
|
||||||
String buildingNum = cityBuildingVO.getBuildingNum();
|
String buildingNum = cityBuildingVO.getBuildingNum();
|
||||||
Integer floor = Integer.valueOf(cityBuildingDTO.getBuildingFloor());
|
Integer floor = Integer.valueOf(cityBuildingDTO.getBuildingFloor());
|
||||||
@ -342,7 +342,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui
|
|||||||
/**
|
/**
|
||||||
* 自动生成楼宇内的房屋信息
|
* 自动生成楼宇内的房屋信息
|
||||||
*/
|
*/
|
||||||
private void saveHouse(String cityBuildingId, CityBuildingVO cityBuildingVO, CityBuildingDTO cityBuildingDTO, String value) throws Exception {
|
private void saveHouse(String cityBuildingId, CityBuildingVO cityBuildingVO, CityBuildingDTO cityBuildingDTO, String value, String token) throws Exception {
|
||||||
// 获取楼宇层数和每层户数以及单元数,用于自动生成该楼宇内的房屋信息
|
// 获取楼宇层数和每层户数以及单元数,用于自动生成该楼宇内的房屋信息
|
||||||
// 楼宇编号
|
// 楼宇编号
|
||||||
String buildingNum = cityBuildingVO.getBuildingNum();
|
String buildingNum = cityBuildingVO.getBuildingNum();
|
||||||
@ -377,7 +377,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui
|
|||||||
String floorNum = k < 10 ? "0"+k : "" + k;
|
String floorNum = k < 10 ? "0"+k : "" + k;
|
||||||
buildingHouseVO.setHouseNumber(buildingNum + "栋" + i + "单元" + j + "楼" + j + floorNum);
|
buildingHouseVO.setHouseNumber(buildingNum + "栋" + i + "单元" + j + "楼" + j + floorNum);
|
||||||
buildingHouseVO.setDataType(1);
|
buildingHouseVO.setDataType(1);
|
||||||
buildingHouseService.save(buildingHouseVO);
|
buildingHouseService.save(token, buildingHouseVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user