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/bmo/room/impl/QueryRoomStatisticsBMOImpl.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java b/service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java
index 8ae4f6c..886ec87 100644
--- a/service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java
@@ -128,8 +128,12 @@
for (RoomDto roomDto : roomDtos) {
for (Map count : repairCounts) {
- if (roomDto.getRoomId().equals(count.get("roomId"))) {
- roomDto.setContractCount(count.get("contractCount").toString());
+ 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;
}
}
}
@@ -146,8 +150,12 @@
for (RoomDto roomDto : roomDtos) {
for (Map count : repairCounts) {
- if (roomDto.getRoomId().equals(count.get("roomId"))) {
- roomDto.setRoomOweFee(count.get("oweFee").toString());
+ 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;
}
}
}
@@ -173,8 +181,12 @@
continue;
}
for (Map count : repairCounts) {
- if (roomDto.getOwnerId().equals(count.get("ownerId"))) {
- roomDto.setOweFee(count.get("oweFee").toString());
+ 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;
}
}
}
@@ -199,11 +211,12 @@
for (RoomDto roomDto : roomDtos) {
for (Map count : repairCounts) {
- if (StringUtil.isEmpty(roomDto.getLink())) {
+ 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;
- }
- if (roomDto.getLink().equals(count.get("ownerTel"))) {
- roomDto.setRepairCount(count.get("repairCount").toString());
}
}
}
@@ -227,8 +240,12 @@
for (RoomDto roomDto : roomDtos) {
for (Map count : complaintCounts) {
- if (roomDto.getLink().equals(count.get("ownerTel"))) {
- roomDto.setComplaintCount(count.get("complaintCount").toString());
+ 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;
}
}
}
@@ -252,8 +269,12 @@
continue;
}
for (Map count : memberCounts) {
- if (roomDto.getOwnerId().equals(count.get("ownerId"))) {
- roomDto.setCarCount(count.get("carCount").toString());
+ 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;
}
}
}
@@ -301,10 +322,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());
}
}
--
Gitblit v1.8.0