From d3e23e26fcfc17e770fca7c29b290ef5082e5734 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 04 七月 2023 22:32:00 +0800
Subject: [PATCH] 优化1.5报表相关bug

---
 service-report/src/main/java/com/java110/report/statistics/IFeeStatistics.java |   68 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 0 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/statistics/IFeeStatistics.java b/service-report/src/main/java/com/java110/report/statistics/IFeeStatistics.java
index 109c66e..438445e 100644
--- a/service-report/src/main/java/com/java110/report/statistics/IFeeStatistics.java
+++ b/service-report/src/main/java/com/java110/report/statistics/IFeeStatistics.java
@@ -28,6 +28,7 @@
 
     /**
      * 鏌ヨ娆犺垂
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -70,6 +71,7 @@
 
     /**
      * 鏌ヨ鏀惰垂鎴垮眿鏁�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -77,6 +79,7 @@
 
     /**
      * 鏌ヨ妤兼爧璐圭敤缁熻淇℃伅
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -84,6 +87,7 @@
 
     /**
      * 璐圭敤椤� 璐圭敤缁熻淇℃伅
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -91,6 +95,7 @@
 
     /**
      * 鏌ヨ瀵硅薄鏄庣粏琛紙鏁伴噺锛�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -98,6 +103,7 @@
 
     /**
      * 鏌ヨ瀵硅薄鏄庣粏琛�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -105,6 +111,7 @@
 
     /**
      * 鏌ヨ涓氫富瀵硅薄鏄庣粏琛�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -112,6 +119,7 @@
 
     /**
      * 浼樻儬閲戦
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -119,6 +127,7 @@
 
     /**
      * 婊炵撼閲�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -126,6 +135,7 @@
 
     /**
      * 棰勫瓨璐︽埛
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -133,6 +143,7 @@
 
     /**
      * 鎵ｆ璐︽埛
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -140,6 +151,7 @@
 
     /**
      * 鏌ヨ涓存椂杞﹁垂鐢ㄦ敹鍏�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -147,6 +159,7 @@
 
     /**
      * 鏌ヨ閫�娆炬娂閲�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -154,6 +167,7 @@
 
     /**
      * 閫�娆捐鍗曟暟
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -161,6 +175,7 @@
 
     /**
      * 閫�娆鹃噾棰�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -169,6 +184,7 @@
 
     /**
      * 鍏呯數妗╁厖鐢甸噾棰�
+     *
      * @param queryStatisticsDto
      * @return
      */
@@ -176,8 +192,60 @@
 
     /**
      * 鎸夋ゼ鏍嬭绠楀疄鏀�
+     *
      * @param queryStatisticsDto
      * @return
      */
     List<Map> getReceivedFeeByFloor(QueryStatisticsDto queryStatisticsDto);
+
+    /**
+     * 鏌ヨ 鏀舵鏂瑰紡缁熻
+     *
+     * @param queryStatisticsDto
+     * @return
+     */
+    List<Map> getReceivedFeeByPrimeRate(QueryStatisticsDto queryStatisticsDto);
+
+    /**
+     * 鏍规嵁妤兼爧鏌ヨ娆犺垂淇℃伅
+     *
+     * @param queryStatisticsDto
+     * @return
+     */
+    List<Map> getOweFeeByFloor(QueryStatisticsDto queryStatisticsDto);
+
+    /**
+     * 璁＄畻瀵硅薄娆犺垂鏄庣粏
+     *
+     * @param queryStatisticsDto
+     * @return
+     */
+    List<Map> getObjOweFee(QueryStatisticsDto queryStatisticsDto);
+
+    long getReceivedRoomCount(QueryStatisticsDto queryStatisticsDto);
+
+    double getReceivedRoomAmount(QueryStatisticsDto queryStatisticsDto);
+
+    long getHisOweReceivedRoomCount(QueryStatisticsDto queryStatisticsDto);
+
+    double getHisOweReceivedRoomAmount(QueryStatisticsDto queryStatisticsDto);
+
+    /**
+     * 鏌ヨ瀹炴敹
+     * @param queryStatisticsDto
+     * @return
+     */
+    List<Map> getObjReceivedFee(QueryStatisticsDto queryStatisticsDto);
+
+    long getMonthReceivedDetailCount(QueryStatisticsDto queryStatisticsDto);
+
+    List<Map> getMonthReceivedDetailInfo(QueryStatisticsDto queryStatisticsDto);
+
+    long getMonthOweDetailCount(QueryStatisticsDto queryStatisticsDto);
+
+    List<Map> getMonthOweDetailInfo(QueryStatisticsDto queryStatisticsDto);
+
+    double getMonthOweDetailAmount(QueryStatisticsDto queryStatisticsDto);
+
+    double getMonthReceivedDetailAmount(QueryStatisticsDto queryStatisticsDto);
 }

--
Gitblit v1.8.0