From a13573d5ef8d16f4bc2535a3c89c2891e6f5b56c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 15:33:30 +0800
Subject: [PATCH] optimize
---
service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java b/service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java
index 3124fef..b47843a 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java
@@ -97,6 +97,13 @@
@RequestParam(value = "configIds", required = false) String configIds,
@RequestParam(value = "payObjType", required = false) String payObjType,
@RequestParam(value = "num", required = false) String num,
+ @RequestParam(value = "ownerName", required = false) String ownerName,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomSubType", required = false) String roomSubType,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "ownerId", required = false) String ownerId,
+ @RequestParam(value = "payerObjId", required = false) String payerObjId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
@@ -105,6 +112,13 @@
reportOweFeeDto.setPayerObjType(payObjType);
reportOweFeeDto.setPayerObjName(num);
reportOweFeeDto.setCommunityId(communityId);
+ reportOweFeeDto.setOwnerName(ownerName);
+ reportOweFeeDto.setFloorId(floorId);
+ reportOweFeeDto.setUnitId(unitId);
+ reportOweFeeDto.setRoomSubType(roomSubType);
+ reportOweFeeDto.setRoomNum(roomNum);
+ reportOweFeeDto.setOwnerId(ownerId);
+ reportOweFeeDto.setPayerObjId(payerObjId);
if (!StringUtil.isEmpty(configIds)) {
String[] tmpConfigIds = configIds.split(",");
reportOweFeeDto.setConfigIds(tmpConfigIds);
@@ -122,13 +136,25 @@
*/
@RequestMapping(value = "/queryReportAllOweFee", method = RequestMethod.GET)
public ResponseEntity<String> queryReportAllOweFee(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "configIds", required = false) String configIds,
- @RequestParam(value = "payObjType", required = false) String payObjType,
- @RequestParam(value = "num", required = false) String num) {
+ @RequestParam(value = "configIds", required = false) String configIds,
+ @RequestParam(value = "payObjType", required = false) String payObjType,
+ @RequestParam(value = "hasOweFee", required = false) String hasOweFee,
+ @RequestParam(value = "ownerName", required = false) String ownerName,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomSubType", required = false) String roomSubType,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "num", required = false) String num) {
ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
reportOweFeeDto.setPayerObjType(payObjType);
reportOweFeeDto.setPayerObjName(num);
reportOweFeeDto.setCommunityId(communityId);
+ reportOweFeeDto.setHasOweFee(hasOweFee);
+ reportOweFeeDto.setOwnerName(ownerName);
+ reportOweFeeDto.setFloorId(floorId);
+ reportOweFeeDto.setUnitId(unitId);
+ reportOweFeeDto.setRoomSubType(roomSubType);
+ reportOweFeeDto.setRoomNum(roomNum);
if (!StringUtil.isEmpty(configIds)) {
String[] tmpConfigIds = configIds.split(",");
reportOweFeeDto.setConfigIds(tmpConfigIds);
--
Gitblit v1.8.0