From cc979fe5a21785c43e220c776272ba2c81048458 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 21 七月 2021 11:46:55 +0800
Subject: [PATCH] 优化 二维码查询功能
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 e1b56e8..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
@@ -1,6 +1,7 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.RoomDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
@@ -215,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);
}
@@ -521,4 +526,25 @@
* limit 10
*/
+ /**
+ * 鏌ヨ璐圭敤鍒嗛」琛�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryNoFeeRooms
+ * @path /app/reportFeeMonthStatistics/queryNoFeeRooms
+ */
+ @RequestMapping(value = "/queryNoFeeRooms", method = RequestMethod.GET)
+ public ResponseEntity<String> queryNoFeeRooms(
+ @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