From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java |  115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 112 insertions(+), 3 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 ec7061d..8ffc01a 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
@@ -2,18 +2,20 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.repair.RepairUserDto;
 import com.java110.dto.report.ReportDeposit;
-import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
-import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
+import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
+import com.java110.po.reportFee.ReportFeeMonthStatisticsPo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName IReportFeeMonthStatisticsInnerServiceSMO
@@ -75,6 +77,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
@@ -101,6 +121,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);
 
@@ -121,6 +160,28 @@
      */
     @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);
 
     /**
      * 鏌ヨ璐圭敤姹囨�昏〃涓暟
@@ -184,6 +245,9 @@
      */
     @RequestMapping(value = "/queryOweFeeDetail", method = RequestMethod.POST)
     List<ReportFeeMonthStatisticsDto> queryOweFeeDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    @RequestMapping(value = "/queryOweFeeDetailMajor", method = RequestMethod.POST)
+    ReportFeeMonthStatisticsDto queryOweFeeDetailMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
     /**
      * 鏌ヨ璐圭敤姹囨�昏〃涓暟
@@ -347,4 +411,49 @@
     @RequestMapping(value = "/queryFeeDepositAmount", method = RequestMethod.POST)
     List<ReportDeposit> queryFeeDepositAmount(@RequestBody ReportDeposit reportDeposit);
 
+
+    /**
+     * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂鎬绘暟
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryHuaningOweFeeCount", method = RequestMethod.POST)
+    int queryHuaningOweFeeCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
+     * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂鏄庣粏 鎸夋ゼ鏍� group by
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryHuaningOweFee", method = RequestMethod.POST)
+    List<ReportFeeMonthStatisticsDto> queryHuaningOweFee(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    @RequestMapping(value = "/queryHuaningPayFeeCount", method = RequestMethod.POST)
+    int queryHuaningPayFeeCount(@RequestBody Map paramInfo);
+
+    @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