From 4b8e9025dd37f09f8bdbe1e5822faea8f25c8064 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 13 七月 2023 12:53:21 +0800
Subject: [PATCH] 优化报表误差
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
index 209a31e..ff5d8b1 100755
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
@@ -1,7 +1,7 @@
package com.java110.user.smo.impl;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.CommunityMemberDto;
+import com.java110.dto.community.CommunityMemberDto;
import com.java110.dto.PageDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerAttrDto;
@@ -15,6 +15,7 @@
import com.java110.po.owner.OwnerPo;
import com.java110.user.dao.IOwnerServiceDao;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.OwnerTypeConstant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
@@ -88,27 +89,46 @@
refreshOwner(owner, users, ownerAttrDtos);
}
- updateOwnerPhone(owners) ;
+ updateOwnerPhone(owners);
return owners;
}
private boolean updateOwnerPhone(List<OwnerDto> owners) {
- if(owners.size() != 1){
+ if (owners.size() > 15) {
return true;
+ }
+
+ List<String> memberIds = new ArrayList<>();
+
+ for (OwnerDto tmpOwnerDto : owners) {
+ memberIds.add(tmpOwnerDto.getMemberId());
}
FileRelDto fileRelDto = new FileRelDto();
- fileRelDto.setObjId(owners.get(0).getMemberId());
+ //fileRelDto.setObjId(owners.get(0).getMemberId());
+ fileRelDto.setObjIds(memberIds.toArray(new String[memberIds.size()]));
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
- if(fileRelDtos == null || fileRelDtos.size()< 1){
+ if (fileRelDtos == null || fileRelDtos.size() < 1) {
return true;
}
- String imgUrl = MappingCache.getValue("IMG_PATH");
- String ownerUrl = imgUrl + fileRelDtos.get(0).getFileSaveName();
+ String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
- owners.get(0).setUrl(ownerUrl);
+ for (OwnerDto tmpOwnerDto : owners) {
+ for (FileRelDto tmpFileRelDto : fileRelDtos) {
+ if (!tmpOwnerDto.getMemberId().equals(tmpFileRelDto.getObjId())) {
+ continue;
+ }
+
+ if (tmpFileRelDto.getFileSaveName().startsWith("http")) {
+ tmpOwnerDto.setUrl(tmpFileRelDto.getFileSaveName());
+ } else {
+ tmpOwnerDto.setUrl(imgUrl + tmpFileRelDto.getFileSaveName());
+ }
+ }
+ }
+
return false;
}
@@ -275,7 +295,7 @@
for (OwnerDto owner : owners) {
refreshOwner(owner, users, ownerAttrDtos);
}
- updateOwnerPhone(owners) ;
+ updateOwnerPhone(owners);
return owners;
}
--
Gitblit v1.8.0