java110
2023-05-30 900829daab40ea7e29440c9de75592cd58a7562a
service-report/src/main/java/com/java110/report/bmo/search/impl/SearchRoomBMOImpl.java
@@ -36,10 +36,17 @@
    }
    private void queryRoomByRoomName(SearchDataDto searchDataDto, List<RoomDto> roomDtos) {
        if (!searchDataDto.getSearchValue().contains("-")) {
        String searchValue = searchDataDto.getSearchValue();
        //1栋1单元1001室
        if(searchValue.contains("栋")){
            searchValue = searchValue.replace("栋","-").replace("单元","-").replace("室","");
        }
        if (!searchValue.contains("-")) {
            return;
        }
        String[] values = searchDataDto.getSearchValue().split("-", 3);
        String[] values = searchValue.split("-", 3);
        if (values.length != 3) {
            return;
@@ -73,6 +80,9 @@
        if (tmpRoomDtos == null || tmpRoomDtos.size() < 1) {
            return;
        }
        for(RoomDto tmpRoomDto : tmpRoomDtos){
            tmpRoomDto.setRoomName(tmpRoomDto.getFloorNum()+"-"+tmpRoomDto.getUnitNum()+"-"+tmpRoomDto.getRoomNum());
        }
        roomDtos.addAll(tmpRoomDtos);
    }
}