From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java
old mode 100644
new mode 100755
index fdde44b..363c1f1
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java
@@ -75,6 +75,8 @@
for (FeeReceiptDto feeReceiptDto : feeReceiptDtos) {
if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeReceiptDto.getObjType())) {
+ feeReceiptDto.setRoomName(feeReceiptDto.getObjName());
+ feeReceiptDto.setCarNum("-");
continue;
}
@@ -89,12 +91,14 @@
* @param feeReceiptDto
*/
private void doFreshRoomInfo(FeeReceiptDto feeReceiptDto) {
+ feeReceiptDto.setCarNum(feeReceiptDto.getObjName());
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCarId(feeReceiptDto.getObjId());
ownerCarDto.setCommunityId(feeReceiptDto.getCommunityId());
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
+ feeReceiptDto.setRoomName("-");
return;
}
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
@@ -102,6 +106,7 @@
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+ feeReceiptDto.setRoomName("-");
return;
}
@@ -116,12 +121,11 @@
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
String roomName = "";
for (RoomDto tRoomDto : roomDtos) {
- roomName += (tRoomDto.getFloorNum() + "鏍�" + tRoomDto.getUnitNum() + "鍗曞厓" + roomDto.getRoomNum() + "瀹�" + "/");
+ roomName += (tRoomDto.getFloorNum() + "鏍�" + tRoomDto.getUnitNum() + "鍗曞厓" + tRoomDto.getRoomNum() + "瀹�" + "/");
}
roomName = roomName.endsWith("/") ? roomName.substring(0, roomName.length() - 1) : roomName;
- feeReceiptDto.setCarNum(feeReceiptDto.getObjName());
- feeReceiptDto.setObjName(roomName);
+ feeReceiptDto.setRoomName(roomName);
}
--
Gitblit v1.8.0