Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-03-29 0b04f664887c73e90bf684a4e69c0fdbfe26349d

 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
@@ -143,7 +145,7 @@
            ownerPo.setLink(importOwnerRoomDto.getTel());
            ownerPo.setMemberId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
            ownerPo.setRemark("房产导入");
            ownerPo.setUserId("-1");
            ownerPo.setUserId(importOwnerRoomDto.getUserId());
            flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);

            if (flag < 1) {
@@ -164,7 +166,7 @@
            ownerPo.setLink(importOwnerRoomDto.getTel());
            ownerPo.setMemberId(ownerDtos.get(0).getMemberId());
            ownerPo.setRemark("房产导入");
            ownerPo.setUserId("-1");
            ownerPo.setUserId(importOwnerRoomDto.getUserId());
            flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
            if (flag < 1) {
                throw new IllegalArgumentException("导入业主失败");
@@ -205,9 +207,8 @@
            ownerPo.setLink(importOwnerRoomDto.getTel());
            ownerPo.setMemberId(ownerPo.getOwnerId());
            ownerPo.setRemark("房产导入");
            ownerPo.setUserId("-1");
            ownerPo.setUserId(importOwnerRoomDto.getUserId());
            flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);

            if (flag < 1) {
                throw new IllegalArgumentException("导入业主失败");
            }
@@ -229,7 +230,7 @@
            ownerPo.setLink(importOwnerRoomDto.getTel());
            ownerPo.setMemberId(ownerPo.getOwnerId());
            ownerPo.setRemark("房产导入");
            ownerPo.setUserId("-1");
            ownerPo.setUserId(importOwnerRoomDto.getUserId());
            flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
            if (flag < 1) {
                throw new IllegalArgumentException("导入业主失败");
@@ -246,10 +247,10 @@
        }

        OwnerRoomRelPo ownerRoomRelPo = new OwnerRoomRelPo();
        ownerRoomRelPo.setUserId("-1");
        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");
@@ -288,7 +290,7 @@
            roomPo.setRoomType("0".equals(importOwnerRoomDto.getUnitNum()) ? RoomDto.ROOM_TYPE_SHOPS : RoomDto.ROOM_TYPE_ROOM);
            roomPo.setUnitId(unitId);
            roomPo.setRemark("房产导入");
            roomPo.setUserId("-1");
            roomPo.setUserId(importOwnerRoomDto.getUserId());
            flag = roomV1InnerServiceSMOImpl.saveRoom(roomPo);

            if (flag < 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");
@@ -315,7 +317,7 @@
                roomPo.setRoomType("0".equals(importOwnerRoomDto.getUnitNum()) ? RoomDto.ROOM_TYPE_SHOPS : RoomDto.ROOM_TYPE_ROOM);
                roomPo.setUnitId(unitId);
                roomPo.setRemark("房产导入");
                roomPo.setUserId("-1");
                roomPo.setUserId(importOwnerRoomDto.getUserId());
                flag = roomV1InnerServiceSMOImpl.updateRoom(roomPo);
                if (flag < 1) {
                    throw new IllegalArgumentException("导入房屋失败");
@@ -351,15 +353,16 @@
            unitPo.setLift(importOwnerRoomDto.getLift());
            unitPo.setUnitId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_unitId));
            unitPo.setUnitArea("1");
            unitPo.setUnitNum(importOwnerRoomDto.getUnitNum());
            unitPo.setRemark("房产导入");
            unitPo.setUserId("-1");
            unitPo.setUserId(importOwnerRoomDto.getUserId());
            flag = unitV1InnerServiceSMOImpl.saveUnit(unitPo);

            if (flag < 1) {
                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())) {
@@ -369,8 +372,9 @@
                unitPo.setLift(importOwnerRoomDto.getLift());
                unitPo.setUnitId(unitId);
                unitPo.setUnitArea("1");
                unitPo.setUnitNum(importOwnerRoomDto.getUnitNum());
                unitPo.setRemark("房产导入");
                unitPo.setUserId("-1");
                unitPo.setUserId(importOwnerRoomDto.getUserId());
                flag = unitV1InnerServiceSMOImpl.updateUnit(unitPo);
                if (flag < 1) {
                    throw new IllegalArgumentException("导入单元失败");
@@ -402,8 +406,9 @@
            floorPo.setFloorArea("1");
            floorPo.setFloorId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_floorId));
            floorPo.setFloorNum(importOwnerRoomDto.getFloorNum());
            floorPo.setName(importOwnerRoomDto.getFloorNum()+"栋");
            floorPo.setRemark("房产导入");
            floorPo.setUserId("-1");
            floorPo.setUserId(importOwnerRoomDto.getUserId());
            flag = floorV1InnerServiceSMOImpl.saveFloor(floorPo);

            if (flag < 1) {
@@ -415,13 +420,14 @@
            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()+"栋");
                floorPo.setRemark("房产导入");
                floorPo.setUserId("-1");
                floorPo.setUserId(importOwnerRoomDto.getUserId());
                flag = floorV1InnerServiceSMOImpl.updateFloor(floorPo);
                if (flag < 1) {
                    throw new IllegalArgumentException("导入楼栋失败");