From 84d7e49924395a5c324060629451efdf7b34420b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 25 二月 2021 15:43:54 +0800
Subject: [PATCH] 优化代码

---
 service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java b/service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java
index 2c9c6fc..b05cdc3 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java
@@ -111,26 +111,31 @@
      *
      * @param communityId 灏忓尯ID
      * @return
-     * @serviceCode /reportFeeYearCollection/queryReportFeeYearCollection
-     * @path /app/reportFeeYearCollection/queryReportFeeYearCollection
+     * @serviceCode /reportFeeYearCollection/queryReportFeeYear
+     * @path /app/reportFeeYearCollection/queryReportFeeYear
      */
-    @RequestMapping(value = "/queryReportFeeYearCollection", method = RequestMethod.GET)
-    public ResponseEntity<String> queryReportFeeYearCollection(@RequestParam(value = "communityId") String communityId,
-                                                               @RequestParam(value = "page") int page,
-                                                               @RequestParam(value = "row") int row) {
+    @RequestMapping(value = "/queryReportFeeYear", method = RequestMethod.GET)
+    public ResponseEntity<String> queryReportFeeYear(@RequestParam(value = "communityId") String communityId,
+                                                     @RequestParam(value = "objType") String objType,
+                                                     @RequestParam(value = "objName",required = false) String objName,
+                                                     @RequestParam(value = "page") int page,
+                                                     @RequestParam(value = "row") int row) {
         ReportFeeYearCollectionDto reportFeeYearCollectionDto = new ReportFeeYearCollectionDto();
         reportFeeYearCollectionDto.setPage(page);
         reportFeeYearCollectionDto.setRow(row);
         reportFeeYearCollectionDto.setCommunityId(communityId);
+        reportFeeYearCollectionDto.setObjType(objType);
+        reportFeeYearCollectionDto.setObjName(objName);
         return getReportFeeYearCollectionBMOImpl.get(reportFeeYearCollectionDto);
     }
 
     /**
      * 寰俊淇濆瓨娑堟伅妯℃澘
-     * @serviceCode /reportFeeYearCollectionDetail/saveReportFeeYearCollectionDetail
-     * @path /app/reportFeeYearCollectionDetail/saveReportFeeYearCollectionDetail
+     *
      * @param reqJson
      * @return
+     * @serviceCode /reportFeeYearCollectionDetail/saveReportFeeYearCollectionDetail
+     * @path /app/reportFeeYearCollectionDetail/saveReportFeeYearCollectionDetail
      */
     @RequestMapping(value = "/saveReportFeeYearCollectionDetail", method = RequestMethod.POST)
     public ResponseEntity<String> saveReportFeeYearCollectionDetail(@RequestBody JSONObject reqJson) {
@@ -147,10 +152,11 @@
 
     /**
      * 寰俊淇敼娑堟伅妯℃澘
-     * @serviceCode /reportFeeYearCollection/updateReportFeeYearCollectionDetail
-     * @path /app/reportFeeYearCollection/updateReportFeeYearCollectionDetail
+     *
      * @param reqJson
      * @return
+     * @serviceCode /reportFeeYearCollection/updateReportFeeYearCollectionDetail
+     * @path /app/reportFeeYearCollection/updateReportFeeYearCollectionDetail
      */
     @RequestMapping(value = "/updateReportFeeYearCollectionDetail", method = RequestMethod.POST)
     public ResponseEntity<String> updateReportFeeYearCollectionDetail(@RequestBody JSONObject reqJson) {
@@ -168,10 +174,11 @@
 
     /**
      * 寰俊鍒犻櫎娑堟伅妯℃澘
-     * @serviceCode /reportFeeYearCollection/deleteReportFeeYearCollectionDetail
-     * @path /app/reportFeeYearCollection/deleteReportFeeYearCollectionDetail
+     *
      * @param reqJson
      * @return
+     * @serviceCode /reportFeeYearCollection/deleteReportFeeYearCollectionDetail
+     * @path /app/reportFeeYearCollection/deleteReportFeeYearCollectionDetail
      */
     @RequestMapping(value = "/deleteReportFeeYearCollectionDetail", method = RequestMethod.POST)
     public ResponseEntity<String> deleteReportFeeYearCollectionDetail(@RequestBody JSONObject reqJson) {
@@ -186,10 +193,11 @@
 
     /**
      * 寰俊鍒犻櫎娑堟伅妯℃澘
-     * @serviceCode /reportFeeYearCollection/queryReportFeeYearCollectionDetail
-     * @path /app/reportFeeYearCollection/queryReportFeeYearCollectionDetail
+     *
      * @param communityId 灏忓尯ID
      * @return
+     * @serviceCode /reportFeeYearCollection/queryReportFeeYearCollectionDetail
+     * @path /app/reportFeeYearCollection/queryReportFeeYearCollectionDetail
      */
     @RequestMapping(value = "/queryReportFeeYearCollectionDetail", method = RequestMethod.GET)
     public ResponseEntity<String> queryReportFeeYearCollectionDetail(@RequestParam(value = "communityId") String communityId,

--
Gitblit v1.8.0