From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 123 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 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 0d281d4..5eaa6b1 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
@@ -18,9 +18,9 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
@RestController
@RequestMapping(value = "/reportFeeMonthStatistics")
@@ -131,6 +131,7 @@
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "configIds", required = false) String configIds,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -145,6 +146,9 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(configIds)) {
+ reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
+ }
return getReportFeeMonthStatisticsBMOImpl.queryReportFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -166,6 +170,7 @@
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "configIds", required = false) String configIds,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -180,6 +185,9 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(configIds)) {
+ reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
+ }
return getReportFeeMonthStatisticsBMOImpl.queryReportFloorUnitFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -203,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();
@@ -217,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");
}
@@ -322,6 +332,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();
@@ -340,6 +351,7 @@
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setObjId(objId);
return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
}
@@ -591,4 +603,111 @@
return getReportFeeMonthStatisticsBMOImpl.queryNoFeeRooms(roomDto);
}
+
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�2021-08-13
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryHuaningOweFee
+ * @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
+ ) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+ reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setPage(page);
+ reportFeeMonthStatisticsDto.setRow(row);
+ reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
+ return getReportFeeMonthStatisticsBMOImpl.queryHuaningOweFee(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�2021-08-13
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryHuaningPayFee
+ * @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
+ ) {
+ 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.queryHuaningPayFee(paramInfo);
+ }
+
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�2021-08-13
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryHuaningPayFeeTwo
+ * @path /app/reportFeeMonthStatistics/queryHuaningPayFeeTwo
+ */
+ @RequestMapping(value = "/queryHuaningPayFeeTwo", method = RequestMethod.GET)
+ public ResponseEntity<String> queryHuaningPayFeeTwo(
+ @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.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