From 2a40532028a9eba044f0815de42a06c8b5d4e356 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 04 七月 2023 21:51:44 +0800
Subject: [PATCH] 优化1.5报表相关bug
---
java110-interface/src/main/java/com/java110/intf/report/IReportFeeStatisticsInnerServiceSMO.java | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 151 insertions(+), 4 deletions(-)
diff --git a/java110-interface/src/main/java/com/java110/intf/report/IReportFeeStatisticsInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/report/IReportFeeStatisticsInnerServiceSMO.java
index 9c91d0c..34f1624 100644
--- a/java110-interface/src/main/java/com/java110/intf/report/IReportFeeStatisticsInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/report/IReportFeeStatisticsInnerServiceSMO.java
@@ -1,10 +1,6 @@
package com.java110.intf.report;
import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.RoomDto;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.owner.OwnerDto;
import com.java110.dto.report.QueryStatisticsDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
@@ -44,6 +40,14 @@
@RequestMapping(value = "/getCurMonthOweFee", method = RequestMethod.POST)
double getCurMonthOweFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
+ /**
+ * 鏌ヨ娆犺垂閲戦
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getOweFee", method = RequestMethod.POST)
+ double getOweFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
/**
* 鏌ヨ褰撴湀搴旀敹
@@ -92,9 +96,152 @@
/**
* 璐圭敤椤规敹璐圭巼缁熻
+ *
* @param queryStatisticsDto
* @return
*/
@RequestMapping(value = "/getConfigFeeSummary", method = RequestMethod.POST)
List<Map> getConfigFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ @RequestMapping(value = "/getObjFeeSummaryCount", method = RequestMethod.POST)
+ int getObjFeeSummaryCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ @RequestMapping(value = "/getObjFeeSummary", method = RequestMethod.POST)
+ List<Map> getObjFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 涓氫富鏄庣粏琛�
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getOwnerFeeSummary", method = RequestMethod.POST)
+ List<Map> getOwnerFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 浼樻儬璐圭敤
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getDiscountFee", method = RequestMethod.POST)
+ double getDiscountFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 婊炵撼閲�
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getLateFee", method = RequestMethod.POST)
+ double getLateFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ棰勫瓨閲戦
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getPrestoreAccount", method = RequestMethod.POST)
+ double getPrestoreAccount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ鎵ｆ閲戦
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getWithholdAccount", method = RequestMethod.POST)
+ double getWithholdAccount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ涓存椂杞︽敹鍏�
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getTempCarFee", method = RequestMethod.POST)
+ double getTempCarFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ閫�娆炬娂閲�
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/geRefundDeposit", method = RequestMethod.POST)
+ double geRefundDeposit(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ @RequestMapping(value = "/geRefundOrderCount", method = RequestMethod.POST)
+ double geRefundOrderCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ @RequestMapping(value = "/geRefundFee", method = RequestMethod.POST)
+ double geRefundFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ鍏呯數妗� 鍏呯數閲戦
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getChargeFee", method = RequestMethod.POST)
+ double getChargeFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ妤兼爧瀹炴敹缁熻
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getReceivedFeeByFloor", method = RequestMethod.POST)
+ List<Map> getReceivedFeeByFloor(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ @RequestMapping(value = "/getReceivedFeeByPrimeRate", method = RequestMethod.POST)
+ List<Map> getReceivedFeeByPrimeRate(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏍规嵁妤兼爧鏌ヨ娆犺垂淇℃伅
+ *
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getOweFeeByFloor", method = RequestMethod.POST)
+ List<Map> getOweFeeByFloor(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ @RequestMapping(value = "/getObjOweFee", method = RequestMethod.POST)
+ List<Map> getObjOweFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ褰撴棩 鎴栬�呭綋鏈堝凡鏀舵埧灞嬫暟
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getReceivedRoomCount", method = RequestMethod.POST)
+ long getReceivedRoomCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ褰撴棩 鎴栬�呭綋鏈堝凡鏀堕噾棰�
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getReceivedRoomAmount", method = RequestMethod.POST)
+ double getReceivedRoomAmount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ /**
+ * 鏌ヨ鍘嗗彶娆犺垂 娓呯即鎴�
+ * @param queryStatisticsDto
+ * @return
+ */
+ @RequestMapping(value = "/getHisOweReceivedRoomCount", method = RequestMethod.POST)
+ long getHisOweReceivedRoomCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ @RequestMapping(value = "/getHisOweReceivedRoomAmount", method = RequestMethod.POST)
+ double getHisOweReceivedRoomAmount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ @RequestMapping(value = "/getObjReceivedFee", method = RequestMethod.POST)
+ List<Map> getObjReceivedFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ long getMonthReceivedDetailCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+ List<Map> getMonthReceivedDetailInfo(@RequestBody QueryStatisticsDto queryStatisticsDto);
}
--
Gitblit v1.8.0