From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java |   84 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 1 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 7cfaff3..075bf8e
--- 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,7 +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;
@@ -189,6 +192,24 @@
     List<ReportFeeMonthStatisticsDto> queryPayFeeDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
     /**
+     * 鏌ヨ璐圭敤姹囨�昏〃鎬昏垂鐢�
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryAllPayFeeDetail", method = RequestMethod.POST)
+    List<ReportFeeMonthStatisticsDto> queryAllPayFeeDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
+     * 鏌ヨ(浼樻儬銆佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤绛�)鎬婚噾棰�
+     *
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
+    @RequestMapping(value = "/queryPayFeeDetailSum", method = RequestMethod.POST)
+    List<ReportFeeMonthStatisticsDto> queryPayFeeDetailSum(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
+    /**
      * 鏌ヨ璐圭敤姹囨�昏〃涓暟
      *
      * @param reportFeeMonthStatisticsDto
@@ -242,9 +263,11 @@
     @RequestMapping(value = "/queryAllPaymentCount", method = RequestMethod.POST)
     List<ReportFeeMonthStatisticsDto> queryAllPaymentCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
 
+    @RequestMapping(value = "/queryReportProficientCount", method = RequestMethod.POST)
+    JSONObject queryReportProficientCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
     /**
      * <p>鏌ヨ灏忓尯妤间俊鎭�</p>
-     *
      *
      * @param feeConfigDto 鏁版嵁瀵硅薄鍒嗕韩
      * @return FeeConfigDto 瀵硅薄鏁版嵁
@@ -252,4 +275,63 @@
     @RequestMapping(value = "/queryFeeConfigs", method = RequestMethod.POST)
     List<FeeConfigDto> queryFeeConfigs(@RequestBody FeeConfigDto feeConfigDto);
 
+    /**
+     * 鏌ヨ缁翠慨甯堝倕鎶ヤ慨淇℃伅
+     *
+     * @param repairUserDto
+     * @return
+     */
+    @RequestMapping(value = "/queryRepair", method = RequestMethod.POST)
+    List<RepairUserDto> queryRepair(@RequestBody RepairUserDto repairUserDto);
+
+    /**
+     * 鏌ヨ鎶ヤ慨淇℃伅
+     *
+     * @param repairUserDto
+     * @return
+     */
+    @RequestMapping(value = "/queryRepairWithOutPage", method = RequestMethod.POST)
+    List<RepairUserDto> queryRepairWithOutPage(@RequestBody RepairUserDto repairUserDto);
+
+    /**
+     * 鏌ヨ鍛樺伐鎶ヤ慨琛ㄥ憳宸ヤ俊鎭�
+     *
+     * @param repairUserDto
+     * @return
+     */
+    @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);
 }

--
Gitblit v1.8.0