From f25c0c8ee3f2d0044d98695c6f6202f9e799a4dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 03 八月 2021 18:47:32 +0800
Subject: [PATCH] 优化 代码
---
service-store/src/main/java/com/java110/store/smo/impl/ContractRoomInnerServiceSMOImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/ContractRoomInnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/ContractRoomInnerServiceSMOImpl.java
index 9591261..d930044 100644
--- a/service-store/src/main/java/com/java110/store/smo/impl/ContractRoomInnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/ContractRoomInnerServiceSMOImpl.java
@@ -3,8 +3,10 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.RoomDto;
import com.java110.dto.contractRoom.ContractRoomDto;
-import com.java110.intf.IContractRoomInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.store.IContractRoomInnerServiceSMO;
import com.java110.po.contractRoom.ContractRoomPo;
import com.java110.store.dao.IContractRoomServiceDao;
import com.java110.utils.util.BeanConvertUtil;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -27,6 +30,9 @@
@Autowired
private IContractRoomServiceDao contractRoomServiceDaoImpl;
+
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@Override
@@ -64,9 +70,33 @@
List<ContractRoomDto> contractRooms = BeanConvertUtil.covertBeanList(contractRoomServiceDaoImpl.getContractRoomInfo(BeanConvertUtil.beanCovertMap(contractRoomDto)), ContractRoomDto.class);
+ if(contractRooms != null && contractRooms.size() > 0){
+ refreshContractRooms(contractRooms);
+ }
return contractRooms;
}
+ private void refreshContractRooms(List<ContractRoomDto> contractRooms) {
+ List<String> roomIds = new ArrayList<>();
+
+ for(ContractRoomDto contractRoomDto : contractRooms){
+ roomIds.add(contractRoomDto.getRoomId());
+ }
+
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ roomDto.setCommunityId(contractRooms.get(0).getCommunityId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+ for(ContractRoomDto contractRoomDto : contractRooms){
+ for(RoomDto tmpRoomDto : roomDtos){
+ if(contractRoomDto.getRoomId().equals(tmpRoomDto.getRoomId())){
+ BeanConvertUtil.covertBean(tmpRoomDto,contractRoomDto);
+ }
+ }
+ }
+ }
+
@Override
public int queryContractRoomsCount(@RequestBody ContractRoomDto contractRoomDto) {
--
Gitblit v1.8.0