From f805ffca7e85eed3a22d17bde3e9637a61718c10 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 26 二月 2021 14:30:54 +0800
Subject: [PATCH] 报表导出
---
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
index 1c4aad7..a3b86fc 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
@@ -211,9 +211,9 @@
reportFeeYearCollectionPo.setObjId(tmpReportCarDto.getCarId());
reportFeeYearCollectionPo.setObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
reportFeeYearCollectionPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
- reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getCarNum() + "(" + tmpReportCarDto.getAreaNum() + "鍋滆溅鍦�" + tmpReportCarDto.getNum() + "杞︿綅)");
+ reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getCarNum());
reportFeeYearCollectionPo.setOwnerId(tmpReportCarDto.getOwnerId());
- reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getOwnerName());
+ reportFeeYearCollectionPo.setOwnerName(tmpReportCarDto.getOwnerName());
reportFeeYearCollectionPo.setOwnerLink(tmpReportCarDto.getLink());
//reportFeeYearCollectionPo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -297,12 +297,12 @@
reportFeeYearCollectionPo.setObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
reportFeeYearCollectionPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
if (RoomDto.ROOM_TYPE_ROOM.equals(reportRoomDto.getRoomType())) {
- reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "鏍�" + reportRoomDto.getUnitNum() + "鍗曞厓" + reportRoomDto.getRoomNum() + "瀹�");
+ reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "-" + reportRoomDto.getUnitNum() + "-" + reportRoomDto.getRoomNum() );
} else {
- reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "鏍�" + reportRoomDto.getRoomNum() + "瀹�");
+ reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "-" + reportRoomDto.getRoomNum() );
}
reportFeeYearCollectionPo.setOwnerId(reportRoomDto.getOwnerId());
- reportFeeYearCollectionPo.setObjName(reportRoomDto.getOwnerName());
+ reportFeeYearCollectionPo.setOwnerName(reportRoomDto.getOwnerName());
reportFeeYearCollectionPo.setOwnerLink(reportRoomDto.getLink());
//reportFeeYearCollectionPo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -422,9 +422,9 @@
feeDetailDto.setFeeId(tmpReportFeeDto.getFeeId());
String flag = CommonCache.getValue(RECEIVED_TIME);
if (RECEIVED_TIME_START.equals(flag)) {
- feeDetailDto.setStartTime(year + "");
+ feeDetailDto.setCurStartYear(year + "");
} else {
- feeDetailDto.setEndTime(year + "");
+ feeDetailDto.setCurEndYear(year + "");
}
double receivedAmount = reportFeeServiceDaoImpl.getFeeReceivedAmount(feeDetailDto);
--
Gitblit v1.8.0