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/ReportOweFeeApi.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 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 af4bc04..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
@@ -94,17 +94,57 @@
      */
     @RequestMapping(value = "/queryReportOweFee", method = RequestMethod.GET)
     public ResponseEntity<String> queryReportOweFee(@RequestParam(value = "communityId") String communityId,
-                                                    @RequestParam(value = "configIds",required = false) String configIds,
+                                                    @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();
         reportOweFeeDto.setPage(page);
         reportOweFeeDto.setRow(row);
+        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);
         }
         return getReportOweFeeBMOImpl.get(reportOweFeeDto);
     }
+
+    /**
+     * 鏌ヨ鎵�鏈夋瑺璐逛俊鎭�
+     *
+     * @param communityId 灏忓尯ID
+     * @return
+     * @serviceCode /reportOweFee/queryReportAllOweFee
+     * @path /app/reportOweFee/queryReportAllOweFee
+     */
+    @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 = "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);
+        }
+        return getReportOweFeeBMOImpl.getAllFees(reportOweFeeDto);
+    }
 }

--
Gitblit v1.8.0