From bf60e979c69a0b063e106fea27ccdb22fe3b32dc Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 19 十二月 2024 13:06:18 +0800
Subject: [PATCH] 房屋加入有效期能力 修改可以修改结束时间 主要应付园区房屋租赁
---
service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
index 0a81944..f9ee97b 100755
--- a/service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java
@@ -17,10 +17,7 @@
import com.java110.po.room.RoomPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.ListUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -128,7 +125,7 @@
}
}
- if (roomAttrDtos == null || roomAttrDtos.size() == 0) {
+ if (ListUtil.isNull(roomAttrDtos)) {
return;
}
@@ -270,19 +267,12 @@
@Override
public List<RoomDto> queryRoomsByOwner(@RequestBody RoomDto roomDto) {
-// List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByOwner(BeanConvertUtil.beanCovertMap(roomDto)),
-// RoomDto.class);
-//
-// if (rooms == null || rooms.size() == 0) {
-// return rooms;
-// }
-
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
ownerRoomRelDto.setOwnerId(roomDto.getOwnerId());
ownerRoomRelDto.setOwnerNameLike(roomDto.getOwnerNameLike());
ownerRoomRelDto.setStatusCd(roomDto.getStatusCd());
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+ if (ListUtil.isNull(ownerRoomRelDtos)) {
return new ArrayList<>();
}
@@ -296,7 +286,21 @@
tmpRoomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
tmpRoomDto.setRoomNum(roomDto.getRoomNum());
tmpRoomDto.setCommunityId(roomDto.getCommunityId());
- return queryRooms(tmpRoomDto);
+ List<RoomDto> roomDtos = queryRooms(tmpRoomDto);
+ if(ListUtil.isNull(roomDtos)){
+ return roomDtos;
+ }
+ for (OwnerRoomRelDto tmpOwnerRoomRelDto : ownerRoomRelDtos) {
+ for(RoomDto tRoomDto:roomDtos){
+ if(!tmpOwnerRoomRelDto.getRoomId().equals(tRoomDto.getRoomId())){
+ continue;
+ }
+ tRoomDto.setStartTime(tmpOwnerRoomRelDto.getStartTime());
+ tRoomDto.setEndTime(tmpOwnerRoomRelDto.getEndTime());
+ }
+ }
+
+ return roomDtos;
}
--
Gitblit v1.8.0