From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
index 5f3346a..43fec57 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
@@ -6,14 +6,15 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.doc.annotation.*;
-import com.java110.dto.RoomDto;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.user.bmo.owner.IQueryOwnerStatisticsBMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -34,7 +35,8 @@
url = "http://{ip}:{port}/app/owner.queryOwners",
resource = "userDoc",
author = "鍚村鏂�",
- serviceCode = "owner.queryOwners"
+ serviceCode = "owner.queryOwners",
+ seq = 12
)
@Java110ParamsDoc(params = {
@@ -103,6 +105,9 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+ @Autowired
+ private IQueryOwnerStatisticsBMO queryOwnerStatisticsBMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "page", "璇锋眰涓湭鍖呭惈page淇℃伅");
@@ -129,11 +134,13 @@
List<OwnerDto> ownerDtos = new ArrayList<>();
if (total > 0) {
List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwners(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
+ // 鏌ヨ缁熻鏁版嵁
+ ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", reqJson.getString("userId"));
for (OwnerDto ownerDto : ownerDtoList) {
//鏌ヨ鐓х墖
FileRelDto fileRelDto = new FileRelDto();
- fileRelDto.setObjId(ownerDto.getOwnerId());
+ fileRelDto.setObjId(ownerDto.getMemberId());
fileRelDto.setRelTypeCd("10000"); //涓氫富鐓х墖
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
if (fileRelDtos != null && fileRelDtos.size() > 0) {
@@ -211,6 +218,9 @@
List<OwnerDto> ownerDtos = new ArrayList<>();
if (total > 0) {
List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(tmpOwnerDto);
+ // 鏌ヨ缁熻鏁版嵁
+ ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
+
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
for (OwnerDto ownerDto : ownerDtoList) {
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
--
Gitblit v1.8.0