Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -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);
			}