From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
index b975e64..08b689c 100644
--- a/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
@@ -10,6 +10,8 @@
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.entity.assetImport.ImportOwnerRoomDto;
import com.java110.intf.community.*;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.po.floor.FloorPo;
import com.java110.po.owner.OwnerPo;
import com.java110.po.owner.OwnerRoomRelPo;
@@ -30,7 +32,7 @@
*/
@RestController
public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implements IImportOwnerRoomInnerServiceSMO {
- private static Logger logger = LoggerFactory.getLogger(CommunityServiceSMOImpl.class);
+ private static Logger logger = LoggerFactory.getLogger(ImportOwnerRoomInnerServiceSMOImpl.class);
@Autowired
@@ -207,7 +209,6 @@
ownerPo.setRemark("鎴夸骇瀵煎叆");
ownerPo.setUserId(importOwnerRoomDto.getUserId());
flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
-
if (flag < 1) {
throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");
}
@@ -249,7 +250,7 @@
ownerRoomRelPo.setUserId(importOwnerRoomDto.getUserId());
ownerRoomRelPo.setbId("-1");
ownerRoomRelPo.setRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
- ownerRoomRelPo.setState("2001");
+ ownerRoomRelPo.setState(importOwnerRoomDto.getRoomState());
ownerRoomRelPo.setRoomId(roomId);
ownerRoomRelPo.setOwnerId(ownerId);
ownerRoomRelPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
@@ -273,7 +274,8 @@
int flag = 0;
if (roomDtos == null || roomDtos.size() < 1) {
roomPo = new RoomPo();
- roomPo.setState(StringUtil.isEmpty(importOwnerRoomDto.getOwnerName()) ? RoomDto.STATE_FREE : RoomDto.STATE_SELL);
+ //roomPo.setState(StringUtil.isEmpty(importOwnerRoomDto.getOwnerName()) ? RoomDto.STATE_FREE : RoomDto.STATE_SELL);
+ roomPo.setState(importOwnerRoomDto.getRoomState());
roomPo.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
roomPo.setApartment(importOwnerRoomDto.getSection());
roomPo.setSection("1");
@@ -300,7 +302,7 @@
roomId = roomDtos.get(0).getRoomId();
if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd()) || StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
roomPo = new RoomPo();
- roomPo.setState(StringUtil.isEmpty(importOwnerRoomDto.getOwnerName()) ? RoomDto.STATE_FREE : RoomDto.STATE_SELL);
+ roomPo.setState(importOwnerRoomDto.getRoomState());
roomPo.setRoomId(roomId);
roomPo.setApartment(importOwnerRoomDto.getSection());
roomPo.setSection("1");
@@ -360,7 +362,7 @@
throw new IllegalArgumentException("瀵煎叆鍗曞厓澶辫触");
}
- unitId = unitPo.getFloorId();
+ unitId = unitPo.getUnitId();
} else {
unitId = unitDtos.get(0).getUnitId();
if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd()) || StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
@@ -418,9 +420,9 @@
floorId = floorDtos.get(0).getFloorId();
if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd()) || StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
floorPo = new FloorPo();
- floorPo.setbId("-1");
+ //floorPo.setbId("-1");
floorPo.setCommunityId(importOwnerRoomDto.getCommunityId());
- floorPo.setFloorArea("1");
+ //floorPo.setFloorArea("1");
floorPo.setFloorId(floorId);
floorPo.setFloorNum(importOwnerRoomDto.getFloorNum());
floorPo.setName(importOwnerRoomDto.getFloorNum()+"鏍�");
--
Gitblit v1.8.0