From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 209 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 188 insertions(+), 21 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 12ca9d1..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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.RoomDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.report.ReportDeposit;
import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
import com.java110.report.bmo.reportFeeMonthStatistics.IDeleteReportFeeMonthStatisticsBMO;
@@ -17,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")
@@ -130,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();
@@ -144,6 +146,9 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(configIds)) {
+ reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
+ }
return getReportFeeMonthStatisticsBMOImpl.queryReportFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -165,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();
@@ -179,6 +185,9 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(configIds)) {
+ reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
+ }
return getReportFeeMonthStatisticsBMOImpl.queryReportFloorUnitFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -202,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();
@@ -216,8 +226,13 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
- reportFeeMonthStatisticsDto.setStartTime(startTime);
- reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setYearMonth(yearMonth);
+ if (!StringUtil.isEmpty(startTime)) {
+ reportFeeMonthStatisticsDto.setStartTime(startTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(endTime)) {
+ reportFeeMonthStatisticsDto.setEndTime(endTime + " 23:59:59");
+ }
return getReportFeeMonthStatisticsBMOImpl.queryFeeBreakdown(reportFeeMonthStatisticsDto);
}
@@ -237,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,
@@ -255,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);
@@ -278,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();
@@ -292,6 +310,7 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setObjName(objName);
return getReportFeeMonthStatisticsBMOImpl.queryOweFeeDetail(reportFeeMonthStatisticsDto);
}
@@ -312,9 +331,12 @@
@RequestParam(value = "roomId", required = false) String roomId,
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "primeRate", required = false) String primeRate,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
@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();
@@ -328,10 +350,52 @@
reportFeeMonthStatisticsDto.setRoomId(roomId);
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setPrimeRate(primeRate);
+ reportFeeMonthStatisticsDto.setState(state);
+ reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setObjId(objId);
return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鎶奸噾鎶ヨ〃
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryPayFeeDeposit
+ * @path /app/reportFeeMonthStatistics/queryPayFeeDeposit
+ */
+ @RequestMapping(value = "/queryPayFeeDeposit", method = RequestMethod.GET)
+ public ResponseEntity<String> queryPayFeeDeposit(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "feeId", required = false) String feeId,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "payerObjType", required = false) String payerObjType,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "detailState", required = false) String detailState,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ReportDeposit reportDeposit = new ReportDeposit();
+ reportDeposit.setPage(page);
+ reportDeposit.setRow(row);
+ reportDeposit.setConfigId(configId);
+ reportDeposit.setFeeId(feeId);
+ reportDeposit.setFeeStartTime(startTime);
+ reportDeposit.setFeeEndTime(endTime);
+ reportDeposit.setPayerObjType(payerObjType);
+ reportDeposit.setState(state);
+ reportDeposit.setDetailState(detailState);
+ reportDeposit.setCommunityId(communityId);
+ reportDeposit.setFloorId(floorId);
+ reportDeposit.setUnitId(unitId);
+ reportDeposit.setRoomNum(roomNum);
+ return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDeposit(reportDeposit);
}
/**
@@ -493,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
@@ -531,10 +579,129 @@
* @path /app/reportFeeMonthStatistics/queryNoFeeRooms
*/
@RequestMapping(value = "/queryNoFeeRooms", method = RequestMethod.GET)
- public ResponseEntity<String> queryNoFeeRooms(@RequestParam(value = "communityId") String communityId) {
+ 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);
}
+
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�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 = "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() + "");
+ 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 = "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);
+ 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