From f4ea663cc61e37a7ab645f2c35e9bcc7f2be7cf8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 28 二月 2025 17:33:32 +0800
Subject: [PATCH] 运营加入 房屋和房屋明细功能
---
service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java | 94 ++++++++++++++++++++++++++++-------------------
1 files changed, 56 insertions(+), 38 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java b/service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java
index 6f55349..f767b11 100644
--- a/service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java
@@ -1,7 +1,7 @@
package com.java110.user.bmo.owner.impl;
import com.java110.dto.owner.OwnerDto;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
+import com.java110.intf.store.IComplaintV1InnerServiceSMO;
import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
@@ -9,6 +9,7 @@
import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.user.bmo.owner.IQueryOwnerStatisticsBMO;
+import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,7 +23,7 @@
public class QueryOwnerStatisticsBMOImpl implements IQueryOwnerStatisticsBMO {
public static final int MAX_LINE_COUNT = 15;
-
+
@Autowired
private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
@@ -47,55 +48,57 @@
@Override
public List<OwnerDto> query(List<OwnerDto> ownerDtos) {
- if(ownerDtos == null || ownerDtos.size() < 1){
+ if (ListUtil.isNull(ownerDtos)) {
return ownerDtos;
}
//杩欓噷闄愬埗琛屾暟锛屼互鍏嶅奖鍝嶇郴缁熸�ц兘
- if(ownerDtos.size() > MAX_LINE_COUNT){
+ if (ownerDtos.size() > MAX_LINE_COUNT) {
return ownerDtos;
}
List<String> ownerIds = new ArrayList<>();
+ List<String> memberIds = new ArrayList<>();
List<String> ownerTels = new ArrayList<>();
- for(OwnerDto ownerDto : ownerDtos){
+ for (OwnerDto ownerDto : ownerDtos) {
ownerIds.add(ownerDto.getOwnerId());
ownerTels.add(ownerDto.getLink());
+ memberIds.add(ownerDto.getMemberId());
}
// 鏌ヨ 鎴垮眿鏁伴噺
- queryRoomCount(ownerIds,ownerDtos);
+ queryRoomCount(ownerIds, ownerDtos);
// 鏌ヨ 瀹跺涵鎴愬憳鏁�
- queryOwnerMemberCount(ownerIds,ownerDtos);
+ queryOwnerMemberCount(ownerIds, ownerDtos);
// 鏌ヨ 杞﹁締鏁�
- queryCarCount(ownerIds,ownerDtos);
+ queryCarCount(memberIds, ownerDtos);
// 鏌ヨ 鎶曡瘔鏁�
- queryComplaintCount(ownerTels,ownerDtos);
+ //queryComplaintCount(ownerTels,ownerDtos);
// 鏌ヨ 鎶ヤ慨鏁�
- queryRepairCount(ownerTels,ownerDtos);
+ //queryRepairCount(ownerTels,ownerDtos);
// 鏌ヨ涓氫富娆犺垂
- queryOwnerOweFee(ownerIds,ownerDtos);
+ queryOwnerOweFee(ownerIds, ownerDtos);
// 鏌ヨ涓氫富鍚堝悓
- queryOwnerContractCount(ownerIds,ownerDtos);
+ //queryOwnerContractCount(ownerIds,ownerDtos);
return ownerDtos;
}
private void queryOwnerContractCount(List<String> ownerIds, List<OwnerDto> ownerDtos) {
Map info = new HashMap();
- info.put("communityId",ownerDtos.get(0).getCommunityId());
- info.put("ownerIds",ownerIds.toArray(new String[ownerIds.size()]));
+ info.put("communityId", ownerDtos.get(0).getCommunityId());
+ info.put("ownerIds", ownerIds.toArray(new String[ownerIds.size()]));
List<Map> contractsCount = contractInnerServiceSMOImpl.queryContractsByOwnerIds(info);
- for(OwnerDto ownerDto : ownerDtos) {
+ for (OwnerDto ownerDto : ownerDtos) {
for (Map count : contractsCount) {
- if(ownerDto.getOwnerId().equals(count.get("ownerId"))){
+ if (ownerDto.getOwnerId().equals(count.get("ownerId"))) {
ownerDto.setContractCount(count.get("contractCount").toString());
}
}
@@ -104,18 +107,19 @@
/**
* 鏌ヨ涓氫富娆犺垂
+ *
* @param ownerIds
* @param ownerDtos
*/
private void queryOwnerOweFee(List<String> ownerIds, List<OwnerDto> ownerDtos) {
Map info = new HashMap();
- info.put("communityId",ownerDtos.get(0).getCommunityId());
- info.put("ownerIds",ownerIds.toArray(new String[ownerIds.size()]));
+ info.put("communityId", ownerDtos.get(0).getCommunityId());
+ info.put("ownerIds", ownerIds.toArray(new String[ownerIds.size()]));
List<Map> repairCounts = reportOweFeeInnerServiceSMOImpl.queryOweFeesByOwnerIds(info);
- for(OwnerDto ownerDto : ownerDtos) {
+ for (OwnerDto ownerDto : ownerDtos) {
for (Map count : repairCounts) {
- if(ownerDto.getOwnerId().equals(count.get("ownerId"))){
+ if (ownerDto.getOwnerId().equals(count.get("ownerId"))) {
ownerDto.setOweFee(count.get("oweFee").toString());
}
}
@@ -125,6 +129,7 @@
/**
* 鏌ヨ涓氫富鎶曡瘔鏁�
+ *
* @param ownerTels
* @param ownerDtos
*/
@@ -132,13 +137,13 @@
Map info = new HashMap();
- info.put("communityId",ownerDtos.get(0).getCommunityId());
- info.put("ownerTels",ownerTels.toArray(new String[ownerTels.size()]));
+ info.put("communityId", ownerDtos.get(0).getCommunityId());
+ info.put("ownerTels", ownerTels.toArray(new String[ownerTels.size()]));
List<Map> repairCounts = repairPoolV1InnerServiceSMOImpl.queryRepairCountByOwnerTels(info);
- for(OwnerDto ownerDto : ownerDtos) {
+ for (OwnerDto ownerDto : ownerDtos) {
for (Map count : repairCounts) {
- if(ownerDto.getLink().equals(count.get("ownerTel"))){
+ if (ownerDto.getLink().equals(count.get("ownerTel"))) {
ownerDto.setRepairCount(count.get("repairCount").toString());
}
}
@@ -147,6 +152,7 @@
/**
* 鏌ヨ涓氫富鎶曡瘔鏁�
+ *
* @param ownerTels
* @param ownerDtos
*/
@@ -154,13 +160,13 @@
Map info = new HashMap();
- info.put("communityId",ownerDtos.get(0).getCommunityId());
- info.put("ownerTels",ownerTels.toArray(new String[ownerTels.size()]));
+ info.put("communityId", ownerDtos.get(0).getCommunityId());
+ info.put("ownerTels", ownerTels.toArray(new String[ownerTels.size()]));
List<Map> complaintCounts = complaintV1InnerServiceSMOImpl.queryComplaintCountByOwnerTels(info);
- for(OwnerDto ownerDto : ownerDtos) {
+ for (OwnerDto ownerDto : ownerDtos) {
for (Map count : complaintCounts) {
- if(ownerDto.getLink().equals(count.get("ownerTel"))){
+ if (ownerDto.getLink().equals(count.get("ownerTel"))) {
ownerDto.setComplaintCount(count.get("complaintCount").toString());
}
}
@@ -169,16 +175,17 @@
/**
* 鏌ヨ涓氫富杞﹁締鏁�
- * @param ownerIds
+ *
+ * @param memberIds
* @param ownerDtos
*/
- private void queryCarCount(List<String> ownerIds, List<OwnerDto> ownerDtos) {
+ private void queryCarCount(List<String> memberIds, List<OwnerDto> ownerDtos) {
- List<Map> memberCounts = ownerCarV1InnerServiceSMOImpl.queryOwnerCarCountByOwnerIds(ownerIds);
+ List<Map> memberCounts = ownerCarV1InnerServiceSMOImpl.queryOwnerCarCountByOwnerIds(memberIds);
- for(OwnerDto ownerDto : ownerDtos) {
+ for (OwnerDto ownerDto : ownerDtos) {
for (Map count : memberCounts) {
- if(ownerDto.getOwnerId().equals(count.get("ownerId"))){
+ if (ownerDto.getMemberId().equals(count.get("ownerId"))) {
ownerDto.setCarCount(count.get("carCount").toString());
}
}
@@ -187,6 +194,7 @@
/**
* 鏌ヨ 涓氫富鎴愬憳鏁�
+ *
* @param ownerIds
* @param ownerDtos
*/
@@ -194,9 +202,13 @@
List<Map> memberCounts = ownerV1InnerServiceSMOImpl.queryOwnerMembersCount(ownerIds);
- for(OwnerDto ownerDto : ownerDtos) {
+ for (OwnerDto ownerDto : ownerDtos) {
+ if (OwnerDto.OWNER_TYPE_CD_MEMBER.equals(ownerDto.getOwnerTypeCd())) {
+ ownerDto.setMemberCount("0");
+ continue;
+ }
for (Map count : memberCounts) {
- if(ownerDto.getOwnerId().equals(count.get("ownerId"))){
+ if (ownerDto.getOwnerId().equals(count.get("ownerId"))) {
ownerDto.setMemberCount(count.get("memberCount").toString());
}
}
@@ -205,6 +217,7 @@
/**
* 鏌ヨ 鎴垮眿鏁伴噺
+ *
* @param ownerIds
* @param ownerDtos
*/
@@ -213,10 +226,15 @@
//鏌ヨ涓氫富鎴垮眿鏁�
List<Map> ownerRoomCounts = ownerRoomRelV1InnerServiceSMOImpl.queryRoomCountByOwnerIds(ownerIds);
- for(OwnerDto ownerDto : ownerDtos) {
+ for (OwnerDto ownerDto : ownerDtos) {
for (Map count : ownerRoomCounts) {
- if(!StringUtil.isEmpty(ownerDto.getOwnerId()) && !StringUtil.isEmpty(count.get("ownerId").toString()))
- if(ownerDto.getOwnerId().equals(count.get("ownerId").toString())){
+ if (StringUtil.isEmpty(ownerDto.getOwnerId())) {
+ continue;
+ }
+ if (StringUtil.isEmpty(count.get("ownerId").toString())) {
+ continue;
+ }
+ if (ownerDto.getOwnerId().equals(count.get("ownerId").toString())) {
ownerDto.setRoomCount(count.get("roomCount").toString());
}
}
--
Gitblit v1.8.0