From ce64e667815b39efdc2f8bd52be0d43d49db8d84 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 17 七月 2022 00:06:29 +0800
Subject: [PATCH] 优化小区位置
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 62 ++++++++++++++----------------
1 files changed, 29 insertions(+), 33 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 e3d7278..cc10983 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
@@ -211,6 +211,7 @@
@RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "yearMonth", required = false) String yearMonth,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -225,6 +226,7 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
+ reportFeeMonthStatisticsDto.setYearMonth(yearMonth);
if (!StringUtil.isEmpty(startTime)) {
reportFeeMonthStatisticsDto.setStartTime(startTime + " 00:00:00");
}
@@ -250,6 +252,7 @@
@RequestParam(value = "unitId", required = false) String unitId,
@RequestParam(value = "roomId", required = false) String roomId,
@RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "feeName", required = false) String feeName,
@@ -268,6 +271,7 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setFeeName(feeName);
reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
return getReportFeeMonthStatisticsBMOImpl.queryFeeDetail(reportFeeMonthStatisticsDto);
@@ -291,6 +295,7 @@
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "objName", required = false) String objName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -305,6 +310,7 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setObjName(objName);
return getReportFeeMonthStatisticsBMOImpl.queryOweFeeDetail(reportFeeMonthStatisticsDto);
}
@@ -551,22 +557,6 @@
return getReportFeeMonthStatisticsBMOImpl.queryOwePaymentCount(reportFeeMonthStatisticsDto);
}
-
- /**
- * 鏌ヨ璐圭敤鍒嗛」琛�
- *
- * @param communityId 灏忓尯ID
- * @return
- * @serviceCode /reportFeeMonthStatistics/queryReportProficient
- * @path /app/reportFeeMonthStatistics/queryReportProficient
- */
- @RequestMapping(value = "/queryReportProficient", method = RequestMethod.GET)
- public ResponseEntity<String> queryReportProficient(@RequestParam(value = "communityId") String communityId) {
- ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
- reportFeeMonthStatisticsDto.setCommunityId(communityId);
- return getReportFeeMonthStatisticsBMOImpl.queryReportProficientCount(reportFeeMonthStatisticsDto);
- }
-
/**
* 鏌ヨ鏈敹璐规埧灞�
* select t.* from building_room t
@@ -589,11 +579,9 @@
* @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
- ) {
+ 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);
@@ -613,13 +601,17 @@
* @path /app/reportFeeMonthStatistics/queryHuaningOweFee
*/
@RequestMapping(value = "/queryHuaningOweFee", method = RequestMethod.GET)
- public ResponseEntity<String> queryHuaningOweFee(
- @RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row
- ) {
+ public ResponseEntity<String> queryHuaningOweFee(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
+ reportFeeMonthStatisticsDto.setFloorNum(floorNum);
reportFeeMonthStatisticsDto.setPage(page);
reportFeeMonthStatisticsDto.setRow(row);
reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
@@ -637,15 +629,19 @@
* @path /app/reportFeeMonthStatistics/queryHuaningPayFee
*/
@RequestMapping(value = "/queryHuaningPayFee", method = RequestMethod.GET)
- public ResponseEntity<String> queryHuaningPayFee(
- @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
- ) {
+ public ResponseEntity<String> queryHuaningPayFee(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "year", required = false) int year,
+ @RequestParam(value = "month", required = false) int month,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
Map paramInfo = new HashMap();
paramInfo.put("communityId", communityId);
+ paramInfo.put("configId", configId);
+ paramInfo.put("feeTypeCd", feeTypeCd);
+ paramInfo.put("floorNum", floorNum);
paramInfo.put("year", year);
paramInfo.put("month", month);
paramInfo.put("page", page);
--
Gitblit v1.8.0