Z四

chengf

2026-01-27 b6184e2ddf3db37a94f7efb3b619bbc64642a292

 service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -17,10 +17,7 @@
import com.java110.po.room.RoomPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import com.java110.utils.util.*;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -96,10 +93,12 @@
                OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
                ownerRoomRelDto.setRoomId(room.getRoomId());
                List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
                Assert.listOnlyOne(ownerRoomRelDtos, "查询业主房屋关系表错误！");
                room.setApartmentName(MappingCache.getValue(room.getApartment().substring(0, 2).toString()) + MappingCache.getValue(room.getApartment().substring(2, 5).toString()));
                room.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
                room.setOwnerName(ownerRoomRelDtos.get(0).getOwnerName());
                try {
                    Assert.listOnlyOne(ownerRoomRelDtos, "查询业主房屋关系表错误！");
                    room.setApartmentName(MappingCache.getValue(room.getApartment().substring(0, 2).toString()) + MappingCache.getValue(room.getApartment().substring(2, 5).toString()));
                    room.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
                    room.setOwnerName(ownerRoomRelDtos.get(0).getOwnerName());
                } catch (Exception ignored) {}
            } catch (Exception e) {
                logger.error("设置房屋户型失败", e);
            }
@@ -128,7 +127,7 @@
            }
        }

        if (roomAttrDtos == null || roomAttrDtos.size() == 0) {
        if (ListUtil.isNull(roomAttrDtos)) {
            return;
        }

@@ -270,19 +269,12 @@
    @Override
    public List<RoomDto> queryRoomsByOwner(@RequestBody RoomDto roomDto) {

//        List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByOwner(BeanConvertUtil.beanCovertMap(roomDto)),
//                RoomDto.class);
//
//        if (rooms == null || rooms.size() == 0) {
//            return rooms;
//        }

        OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
        ownerRoomRelDto.setOwnerId(roomDto.getOwnerId());
        ownerRoomRelDto.setOwnerNameLike(roomDto.getOwnerNameLike());
        ownerRoomRelDto.setStatusCd(roomDto.getStatusCd());
        List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
        if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
        if (ListUtil.isNull(ownerRoomRelDtos)) {
            return new ArrayList<>();
        }

@@ -296,7 +288,21 @@
        tmpRoomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
        tmpRoomDto.setRoomNum(roomDto.getRoomNum());
        tmpRoomDto.setCommunityId(roomDto.getCommunityId());
        return queryRooms(tmpRoomDto);
        List<RoomDto> roomDtos = queryRooms(tmpRoomDto);
        if(ListUtil.isNull(roomDtos)){
            return roomDtos;
        }
        for (OwnerRoomRelDto tmpOwnerRoomRelDto : ownerRoomRelDtos) {
            for(RoomDto tRoomDto:roomDtos){
                if(!tmpOwnerRoomRelDto.getRoomId().equals(tRoomDto.getRoomId())){
                    continue;
                }
                tRoomDto.setStartTime(tmpOwnerRoomRelDto.getStartTime());
                tRoomDto.setEndTime(tmpOwnerRoomRelDto.getEndTime());
            }
        }

        return roomDtos;

    }

@@ -347,6 +353,11 @@
        return importCustomCreateFeeDtos;
    }

    @Override
    public List<Map> queryRoomsAsReport(RoomDto roomDto) {
        return roomServiceDaoImpl.queryRoomsAsReport(BeanConvertUtil.beanCovertMap(roomDto));
    }

    public IRoomServiceDao getRoomServiceDaoImpl() {
        return roomServiceDaoImpl;
    }