From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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 7da463d..3f58b4c 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
@@ -326,6 +326,7 @@
@RequestParam(value = "configId", required = false) String configId,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "objId", required = false) String objId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -344,6 +345,7 @@
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setObjId(objId);
return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
}
@@ -672,6 +674,32 @@
paramInfo.put("row", row);
return getReportFeeMonthStatisticsBMOImpl.queryHuaningPayFeeTwo(paramInfo);
}
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�2021-08-13
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryHuaningOweFeeDetail
+ * @path /app/reportFeeMonthStatistics/queryHuaningOweFeeDetail
+ */
+ @RequestMapping(value = "/queryHuaningOweFeeDetail", method = RequestMethod.GET)
+ public ResponseEntity<String> queryHuaningOweFeeDetail(
+ @RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "year") int year,
+ @RequestParam(value = "month") int month,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row
+ ) {
+ Map paramInfo = new HashMap();
+ paramInfo.put("communityId", communityId);
+ paramInfo.put("year", year);
+ paramInfo.put("month", month);
+ paramInfo.put("page", page);
+ paramInfo.put("row", row);
+ return getReportFeeMonthStatisticsBMOImpl.queryHuaningOweFeeDetail(paramInfo);
+ }
}
--
Gitblit v1.8.0