From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-community/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 58207ae..01c9466
--- a/service-community/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
@@ -1,10 +1,13 @@
package com.java110.community.smo.impl;
+import com.java110.community.dao.IFloorAttrServiceDao;
+import com.java110.dto.floorAttr.FloorAttrDto;
+import com.java110.intf.community.IFloorAttrInnerServiceSMO;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.IFloorServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.community.IFloorInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.intf.community.IFloorInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.FloorDto;
import com.java110.dto.PageDto;
import com.java110.dto.user.UserDto;
@@ -34,6 +37,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+ @Autowired
+ private IFloorAttrServiceDao floorAttrServiceDaoImpl;
/**
* 鏌ヨ 淇℃伅
@@ -101,9 +107,35 @@
//鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+ List<String> floorIds = new ArrayList<>();
for (FloorDto floor : floors) {
+ floorIds.add(floor.getFloorId());
refreshFloor(floor, users);
}
+
+ Map info = new HashMap();
+ info.put("floorIds", floorIds.toArray(new String[floorIds.size()]));
+ info.put("communityId", floors.get( 0 ).getCommunityId());
+ List<FloorAttrDto> floorAttrDtos = BeanConvertUtil.covertBeanList(floorAttrServiceDaoImpl.getFloorAttrInfo(info), FloorAttrDto.class);
+
+ if (floorAttrDtos == null || floorAttrDtos.size() < 1) {
+ return floors;
+ }
+
+
+ for (FloorDto tmpFloorDto : floors) {
+ List<FloorAttrDto> tmpCommunityAttrDtos = new ArrayList<>();
+ for (FloorAttrDto floorAttrDto : floorAttrDtos) {
+ if (tmpFloorDto.getCommunityId().equals(floorAttrDto.getCommunityId()) && tmpFloorDto.getFloorId().equals( floorAttrDto.getFloorId() )) {
+ tmpCommunityAttrDtos.add(floorAttrDto);
+ }
+ }
+ tmpFloorDto.setFloorAttrDto(tmpCommunityAttrDtos);
+
+ }
+
+
+
return floors;
}
--
Gitblit v1.8.0