From 2fc8dd46527fbf2efd21e6a95ccc5efb099a7d69 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:19:31 +0800
Subject: [PATCH] 合并master

---
 service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java |  115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 112 insertions(+), 3 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 0d281d4..93a19cf 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
@@ -16,11 +16,15 @@
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/reportFeeMonthStatistics")
@@ -591,4 +595,109 @@
         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 = "page") int page,
+            @RequestParam(value = "row") int row
+    ) {
+        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+        reportFeeMonthStatisticsDto.setCommunityId(communityId);
+        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 = "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.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