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/smo/impl/FloorInnerServiceSMOImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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
index df23172..d1f5366 100755
--- 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,5 +1,9 @@
package com.java110.community.smo.impl;
+import com.java110.community.dao.IFloorAttrServiceDao;
+import com.java110.dto.UnitDto;
+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;
@@ -34,6 +38,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+ @Autowired
+ private IFloorAttrServiceDao floorAttrServiceDaoImpl;
/**
* 鏌ヨ 淇℃伅
@@ -101,9 +108,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;
}
@@ -112,6 +145,12 @@
return floorServiceDaoImpl.queryFloorsCount(BeanConvertUtil.beanCovertMap(floorDto));
}
+ @Override
+ public List<UnitDto> queryFloorAndUnits(@RequestBody UnitDto unitDto) {
+
+ return BeanConvertUtil.covertBeanList(floorServiceDaoImpl.queryFloorAndUnits(BeanConvertUtil.beanCovertMap(unitDto)),UnitDto.class);
+ }
+
/**
* 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
--
Gitblit v1.8.0