From 1680f7e37244c665c1a696187135541eadc8f3e5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 07 八月 2021 23:40:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java b/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
index c4555ae..a382013 100755
--- a/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
@@ -216,8 +216,12 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
- reportFeeMonthStatisticsDto.setStartTime(startTime);
- reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(startTime)) {
+ reportFeeMonthStatisticsDto.setStartTime(startTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(endTime)) {
+ reportFeeMonthStatisticsDto.setEndTime(endTime + " 23:59:59");
+ }
return getReportFeeMonthStatisticsBMOImpl.queryFeeBreakdown(reportFeeMonthStatisticsDto);
}
@@ -535,9 +539,11 @@
@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row
- ) {
+ ) {
RoomDto roomDto = new RoomDto();
roomDto.setCommunityId(communityId);
+ roomDto.setPage(page);
+ roomDto.setRow(row);
return getReportFeeMonthStatisticsBMOImpl.queryNoFeeRooms(roomDto);
}
--
Gitblit v1.8.0