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/ReportOweFeeApi.java |   18 +++++++++++++++---
 1 files changed, 15 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..5a3e075 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,11 @@
                                                     @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 = "page") int page,
                                                     @RequestParam(value = "row") int row) {
         ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
@@ -105,6 +110,11 @@
         reportOweFeeDto.setPayerObjType(payObjType);
         reportOweFeeDto.setPayerObjName(num);
         reportOweFeeDto.setCommunityId(communityId);
+        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);
@@ -122,13 +132,15 @@
      */
     @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 = "num", required = false) String num) {
         ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
         reportOweFeeDto.setPayerObjType(payObjType);
         reportOweFeeDto.setPayerObjName(num);
         reportOweFeeDto.setCommunityId(communityId);
+        reportOweFeeDto.setHasOweFee(hasOweFee);
         if (!StringUtil.isEmpty(configIds)) {
             String[] tmpConfigIds = configIds.split(",");
             reportOweFeeDto.setConfigIds(tmpConfigIds);

--
Gitblit v1.8.0