From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四
---
service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 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 3a66732..4214703 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
@@ -5,20 +5,19 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.PageDto;
-import com.java110.dto.RoomAttrDto;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomAttrDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.user.UserDto;
-import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
-import com.java110.entity.assetImport.ImportRoomFee;
+import com.java110.dto.importData.ImportCustomCreateFeeDto;
+import com.java110.dto.importData.ImportRoomFee;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.room.RoomPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.util.BeanConvertUtil;
-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;
@@ -67,7 +66,7 @@
List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByCommunityId(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class);
- if (rooms == null || rooms.size() == 0) {
+ if (ListUtil.isNull(rooms)) {
return rooms;
}
@@ -91,7 +90,15 @@
for (RoomDto room : rooms) {
try {
- room.setApartmentName(MappingCache.getValue(room.getApartment().substring(0, 2).toString()) + MappingCache.getValue(room.getApartment().substring(2, 5).toString()));
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(room.getRoomId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ try {
+ Assert.listOnlyOne(ownerRoomRelDtos, "鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄩ敊璇紒");
+ room.setApartmentName(MappingCache.getValue(room.getApartment().substring(0, 2).toString()) + MappingCache.getValue(room.getApartment().substring(2, 5).toString()));
+ room.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
+ room.setOwnerName(ownerRoomRelDtos.get(0).getOwnerName());
+ } catch (Exception ignored) {}
} catch (Exception e) {
logger.error("璁剧疆鎴垮眿鎴峰瀷澶辫触", e);
}
@@ -120,7 +127,7 @@
}
}
- if (roomAttrDtos == null || roomAttrDtos.size() == 0) {
+ if (ListUtil.isNull(roomAttrDtos)) {
return;
}
@@ -262,31 +269,40 @@
@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<>();
}
+ RoomDto tmpRoomDto = new RoomDto();
List<String> roomIds = new ArrayList<>();
for (OwnerRoomRelDto tmpOwnerRoomRelDto : ownerRoomRelDtos) {
roomIds.add(tmpOwnerRoomRelDto.getRoomId());
+ tmpRoomDto.setOwnerId(tmpOwnerRoomRelDto.getOwnerId());
+ tmpRoomDto.setOwnerName(tmpOwnerRoomRelDto.getOwnerName());
}
- RoomDto tmpRoomDto = new RoomDto();
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;
}
@@ -316,6 +332,7 @@
importRoomFee.setFloorNum(infos.get(0).get("floorNum").toString());
importRoomFee.setUnitNum(infos.get(0).get("unitNum").toString());
importRoomFee.setRoomNum(infos.get(0).get("roomNum").toString());
+ importRoomFee.setRoomName(importRoomFee.getFloorNum() + "-" + importRoomFee.getUnitNum() + "-" + importRoomFee.getRoomNum());
}
return importRoomFees;
@@ -336,6 +353,11 @@
return importCustomCreateFeeDtos;
}
+ @Override
+ public List<Map> queryRoomsAsReport(RoomDto roomDto) {
+ return roomServiceDaoImpl.queryRoomsAsReport(BeanConvertUtil.beanCovertMap(roomDto));
+ }
+
public IRoomServiceDao getRoomServiceDaoImpl() {
return roomServiceDaoImpl;
}
--
Gitblit v1.8.0