From dbea8ec9fde739d028d656ac7031091fae6e6c2c Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:03:50 +0800
Subject: [PATCH] 1、新增费用提前预生成账单2、优化强制回单3、区配置新增退费收据开关4、权限优化
---
service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 b0f2719..5b18427 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,6 +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.StringUtil;
import org.slf4j.Logger;
@@ -91,7 +92,13 @@
for (RoomDto room : rooms) {
try {
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(room.getRoomId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ 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 e) {
logger.error("璁剧疆鎴垮眿鎴峰瀷澶辫触", e);
}
@@ -278,11 +285,13 @@
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());
@@ -316,7 +325,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());
+ importRoomFee.setRoomName(importRoomFee.getFloorNum() + "-" + importRoomFee.getUnitNum() + "-" + importRoomFee.getRoomNum());
}
return importRoomFees;
--
Gitblit v1.8.0