From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug
---
service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java b/service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java
old mode 100644
new mode 100755
index 37a6e7d..d91bf14
--- a/service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java
@@ -1,8 +1,9 @@
package com.java110.user.bmo.rentingPool.impl;
import com.java110.dto.RoomDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.rentingPool.RentingPoolDto;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.user.IRentingPoolInnerServiceSMO;
import com.java110.user.bmo.rentingPool.IGetRentingPoolBMO;
@@ -23,6 +24,9 @@
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
/**
@@ -54,8 +58,11 @@
private void refreshRoomInfo(List<RentingPoolDto> rentingPoolDtos) {
List<String> roomIds = new ArrayList<>();
+ List<String> rentingIds = new ArrayList<>();
+
for (RentingPoolDto rentingPoolDto : rentingPoolDtos) {
roomIds.add(rentingPoolDto.getRoomId());
+ rentingIds.add(rentingPoolDto.getRentingId());
}
RoomDto roomDto = new RoomDto();
@@ -70,11 +77,29 @@
if (tmpRoomDto.getRoomId().equals(rentingPoolDto.getRoomId())) {
rentingPoolDto.setRoomName(tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getUnitNum() + "鍗曞厓" + tmpRoomDto.getRoomNum() + "瀹�");
rentingPoolDto.setBuiltUpArea(tmpRoomDto.getBuiltUpArea());
- rentingPoolDto.setSection(tmpRoomDto.getSection());
+ rentingPoolDto.setApartmentName(tmpRoomDto.getApartmentName());
}
}
}
+
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjIds(rentingIds.toArray(new String[rentingIds.size()]));
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+
+ //鍒峰叆鍥剧墖淇℃伅
+ List<String> photoVos = null;
+ String url = null;
+ for (RentingPoolDto rentingPoolDto : rentingPoolDtos) {
+ photoVos = new ArrayList<>();
+ for (FileRelDto tmpFileRelDto : fileRelDtos) {
+ if (rentingPoolDto.getRentingId().equals(tmpFileRelDto.getObjId())){
+ url = "/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + rentingPoolDto.getCommunityId();
+ photoVos.add(url);
+ }
+ }
+ rentingPoolDto.setPhotos(photoVos);
+ }
}
}
--
Gitblit v1.8.0