1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug

xiaogang

2023-03-20 6e13e0fa577df5511157a7841617106bd2f5c0b2

 service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java

@@ -120,8 +120,12 @@

        for (RoomDto roomDto : roomDtos) {
            for (Map count : repairCounts) {
                if (roomDto.getRoomId().equals(count.get("roomId"))) {
                if (!StringUtil.isEmpty(roomDto.getRoomId()) && !StringUtil.isEmpty(count.get("roomId").toString())) {
                    if (roomDto.getRoomId().equals(count.get("roomId").toString())) {
                    roomDto.setContractCount(count.get("contractCount").toString());
                    }
                } else {
                    continue;
                }
            }
        }
@@ -135,8 +139,12 @@

        for (RoomDto roomDto : roomDtos) {
            for (Map count : repairCounts) {
                if (roomDto.getRoomId().equals(count.get("roomId"))) {
                if (!StringUtil.isEmpty(roomDto.getRoomId()) && !StringUtil.isEmpty(count.get("roomId").toString())) {
                    if (roomDto.getRoomId().equals(count.get("roomId").toString())) {
                    roomDto.setRoomOweFee(count.get("oweFee").toString());
                    }
                } else {
                    continue;
                }
            }
        }
@@ -156,8 +164,12 @@

        for (RoomDto roomDto : roomDtos) {
            for (Map count : repairCounts) {
                if (roomDto.getOwnerId().equals(count.get("ownerId"))) {
                if (!StringUtil.isEmpty(roomDto.getOwnerId()) && !StringUtil.isEmpty(count.get("ownerId").toString())) {
                    if (roomDto.getOwnerId().equals(count.get("ownerId").toString())) {
                    roomDto.setOweFee(count.get("oweFee").toString());
                    }
                } else {
                    continue;
                }
            }
        }
@@ -180,8 +192,12 @@

        for (RoomDto roomDto : roomDtos) {
            for (Map count : repairCounts) {
                if (roomDto.getLink().equals(count.get("ownerTel"))) {
                if (!StringUtil.isEmpty(roomDto.getLink()) && !StringUtil.isEmpty(count.get("ownerTel").toString())) {
                    if (roomDto.getLink().equals(count.get("ownerTel").toString())) {
                    roomDto.setRepairCount(count.get("repairCount").toString());
                    }
                } else {
                    continue;
                }
            }
        }
@@ -203,8 +219,12 @@

        for (RoomDto roomDto : roomDtos) {
            for (Map count : complaintCounts) {
                if (roomDto.getLink().equals(count.get("ownerTel"))) {
                if (!StringUtil.isEmpty(roomDto.getLink()) && !StringUtil.isEmpty(count.get("ownerTel").toString())) {
                    if (roomDto.getLink().equals(count.get("ownerTel").toString())) {
                    roomDto.setComplaintCount(count.get("complaintCount").toString());
                    }
                } else {
                    continue;
                }
            }
        }
@@ -222,8 +242,12 @@

        for (RoomDto roomDto : roomDtos) {
            for (Map count : memberCounts) {
                if (roomDto.getOwnerId().equals(count.get("ownerId"))) {
                if (!StringUtil.isEmpty(roomDto.getOwnerId()) && !StringUtil.isEmpty(count.get("ownerId").toString())) {
                    if (roomDto.getOwnerId().equals(count.get("ownerId").toString())) {
                    roomDto.setCarCount(count.get("carCount").toString());
                    }
                } else {
                    continue;
                }
            }
        }
@@ -261,10 +285,10 @@

        for (RoomDto roomDto : roomDtos) {
            for (Map count : ownerRoomCounts) {
                if(StringUtil.isEmpty(roomDto.getOwnerId())){
                if (StringUtil.isEmpty(roomDto.getOwnerId()) || StringUtil.isEmpty(count.get("ownerId").toString())) {
                    continue;
                }
                if (roomDto.getOwnerId().equals(count.get("ownerId"))) {
                if (roomDto.getOwnerId().equals(count.get("ownerId").toString())) {
                    roomDto.setRoomCount(count.get("roomCount").toString());
                }
            }