From b8e7bb1791ff41be5ee8150cc46af082d7444a65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 31 五月 2023 01:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java |   82 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 0 deletions(-)

diff --git a/java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java
index a7d0f3d..ab4066d 100755
--- a/java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java
@@ -4,7 +4,9 @@
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.report.QueryStatisticsDto;
 import com.java110.dto.report.ReportDeposit;
 import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
 import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
@@ -76,6 +78,24 @@
     List<ReportFeeMonthStatisticsDto> queryReportFeeSummary(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
     /**
+     * 鏌ヨ璐圭敤姹囨�昏〃涓暟
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryReportFeeSummaryDetailCount", method = RequestMethod.POST)
+    int queryReportFeeSummaryDetailCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
+     * 鏌ヨ璐圭敤姹囨�昏〃
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryReportFeeSummaryDetail", method = RequestMethod.POST)
+    List<ReportFeeMonthStatisticsDto> queryReportFeeSummaryDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
      * 鏌ヨ璐圭敤姹囨�昏〃 澶ц
      *
      * @param reportFeeMonthStatisticsDto
@@ -102,6 +122,25 @@
     @RequestMapping(value = "/queryReportFloorUnitFeeSummary", method = RequestMethod.POST)
     List<ReportFeeMonthStatisticsDto> queryReportFloorUnitFeeSummary(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
+    /**
+     * 鏌ヨ璐圭敤姹囨�昏〃涓暟
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryReportFloorUnitFeeSummaryDetailCount", method = RequestMethod.POST)
+    int queryReportFloorUnitFeeSummaryDetailCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
+     * 鏌ヨ璐圭敤姹囨�昏〃
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryReportFloorUnitFeeDetailSummary", method = RequestMethod.POST)
+    List<ReportFeeMonthStatisticsDto> queryReportFloorUnitFeeDetailSummary(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+
     @RequestMapping(value = "/queryReportFloorUnitFeeSummaryMajor", method = RequestMethod.POST)
     ReportFeeMonthStatisticsDto queryReportFloorUnitFeeSummaryMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
@@ -122,6 +161,25 @@
      */
     @RequestMapping(value = "/queryFeeBreakdown", method = RequestMethod.POST)
     List<ReportFeeMonthStatisticsDto> queryFeeBreakdown(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
+     * 鏌ヨ璐圭敤姹囨�昏〃涓暟
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryFeeBreakdownDetailCount", method = RequestMethod.POST)
+    int queryFeeBreakdownDetailCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
+     * 鏌ヨ璐圭敤姹囨�昏〃
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryFeeBreakdownDetail", method = RequestMethod.POST)
+    List<ReportFeeMonthStatisticsDto> queryFeeBreakdownDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
 
     @RequestMapping(value = "/queryFeeBreakdownMajor", method = RequestMethod.POST)
     ReportFeeMonthStatisticsDto queryFeeBreakdownMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
@@ -191,6 +249,7 @@
 
     @RequestMapping(value = "/queryOweFeeDetailMajor", method = RequestMethod.POST)
     ReportFeeMonthStatisticsDto queryOweFeeDetailMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
     /**
      * 鏌ヨ璐圭敤姹囨�昏〃涓暟
      *
@@ -356,6 +415,7 @@
 
     /**
      * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂鎬绘暟
+     *
      * @param reportFeeMonthStatisticsDto
      * @return
      */
@@ -364,6 +424,7 @@
 
     /**
      * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂鏄庣粏 鎸夋ゼ鏍� group by
+     *
      * @param reportFeeMonthStatisticsDto
      * @return
      */
@@ -375,4 +436,25 @@
 
     @RequestMapping(value = "/queryHuaningPayFee", method = RequestMethod.POST)
     List<Map> queryHuaningPayFee(@RequestBody Map paramInfo);
+
+    @RequestMapping(value = "/queryHuaningPayFeeTwoCount", method = RequestMethod.POST)
+    int queryHuaningPayFeeTwoCount(@RequestBody Map paramInfo);
+
+    @RequestMapping(value = "/queryHuaningPayFeeTwo", method = RequestMethod.POST)
+    List<Map> queryHuaningPayFeeTwo(@RequestBody Map paramInfo);
+
+    @RequestMapping(value = "/queryHuaningOweFeeDetailCount", method = RequestMethod.POST)
+    int queryHuaningOweFeeDetailCount(@RequestBody Map paramInfo);
+
+    @RequestMapping(value = "/queryHuaningOweFeeDetail", method = RequestMethod.POST)
+    List<Map> queryHuaningOweFeeDetail(@RequestBody Map paramInfo);
+
+    /**
+     * @param ownerDto
+     * @return
+     */
+    @RequestMapping(value = "/queryRoomAndParkingSpace", method = RequestMethod.POST)
+    List<OwnerDto> queryRoomAndParkingSpace(@RequestBody OwnerDto ownerDto);
+
+
 }

--
Gitblit v1.8.0