From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java |   88 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 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
old mode 100644
new mode 100755
index cd187bc..05a8bec
--- 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,8 +2,10 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
 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 org.springframework.cloud.openfeign.FeignClient;
@@ -12,6 +14,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName IReportFeeMonthStatisticsInnerServiceSMO
@@ -73,6 +76,15 @@
     List<ReportFeeMonthStatisticsDto> queryReportFeeSummary(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
     /**
+     * 鏌ヨ璐圭敤姹囨�昏〃 澶ц
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryReportFeeSummaryMajor", method = RequestMethod.POST)
+    ReportFeeMonthStatisticsDto queryReportFeeSummaryMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
      * 鏌ヨ璐圭敤姹囨�昏〃涓暟
      *
      * @param reportFeeMonthStatisticsDto
@@ -89,6 +101,9 @@
      */
     @RequestMapping(value = "/queryReportFloorUnitFeeSummary", method = RequestMethod.POST)
     List<ReportFeeMonthStatisticsDto> queryReportFloorUnitFeeSummary(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    @RequestMapping(value = "/queryReportFloorUnitFeeSummaryMajor", method = RequestMethod.POST)
+    ReportFeeMonthStatisticsDto queryReportFloorUnitFeeSummaryMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
     /**
      * 鏌ヨ璐圭敤姹囨�昏〃涓暟
@@ -107,6 +122,9 @@
      */
     @RequestMapping(value = "/queryFeeBreakdown", method = RequestMethod.POST)
     List<ReportFeeMonthStatisticsDto> queryFeeBreakdown(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    @RequestMapping(value = "/queryFeeBreakdownMajor", method = RequestMethod.POST)
+    ReportFeeMonthStatisticsDto queryFeeBreakdownMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
     /**
      * 鏌ヨ璐圭敤姹囨�昏〃涓暟
@@ -171,6 +189,8 @@
     @RequestMapping(value = "/queryOweFeeDetail", method = RequestMethod.POST)
     List<ReportFeeMonthStatisticsDto> queryOweFeeDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
+    @RequestMapping(value = "/queryOweFeeDetailMajor", method = RequestMethod.POST)
+    ReportFeeMonthStatisticsDto queryOweFeeDetailMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
     /**
      * 鏌ヨ璐圭敤姹囨�昏〃涓暟
      *
@@ -263,6 +283,7 @@
 
     @RequestMapping(value = "/queryReportProficientCount", method = RequestMethod.POST)
     JSONObject queryReportProficientCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
     /**
      * <p>鏌ヨ灏忓尯妤间俊鎭�</p>
      *
@@ -299,4 +320,71 @@
     @RequestMapping(value = "/queryRepairForStaff", method = RequestMethod.POST)
     List<RepairUserDto> queryRepairForStaff(@RequestBody RepairUserDto repairUserDto);
 
+    /**
+     * 鏌ヨ鏈敹璐规埧灞�
+     *
+     * @param roomDto
+     * @return
+     */
+    @RequestMapping(value = "/queryNoFeeRoomsCount", method = RequestMethod.POST)
+    int queryNoFeeRoomsCount(@RequestBody RoomDto roomDto);
+
+    /**
+     * 鏌ヨ鏈敹璐规埧灞�
+     *
+     * @param roomDto 鎴垮眿
+     * @return
+     */
+    @RequestMapping(value = "/queryNoFeeRooms", method = RequestMethod.POST)
+    List<RoomDto> queryNoFeeRooms(@RequestBody RoomDto roomDto);
+
+    /**
+     * 鏌ヨ鎶奸噾
+     *
+     * @param reportDeposit
+     * @return
+     */
+    @RequestMapping(value = "/queryFeeDeposit", method = RequestMethod.POST)
+    List<ReportDeposit> queryPayFeeDeposit(@RequestBody ReportDeposit reportDeposit);
+
+    /**
+     * 鏌ヨ鎶奸噾閫�璐规�婚噾棰�
+     */
+    @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);
 }

--
Gitblit v1.8.0