From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-interface/src/main/java/com/java110/intf/report/IBaseDataStatisticsInnerServiceSMO.java | 90 +++++++++++++--------------------------------
1 files changed, 26 insertions(+), 64 deletions(-)
diff --git a/java110-interface/src/main/java/com/java110/intf/report/IBaseDataStatisticsInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/report/IBaseDataStatisticsInnerServiceSMO.java
index 196b02c..012d66d 100644
--- a/java110-interface/src/main/java/com/java110/intf/report/IBaseDataStatisticsInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/report/IBaseDataStatisticsInnerServiceSMO.java
@@ -1,18 +1,17 @@
package com.java110.intf.report;
import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.dto.room.RoomDto;
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 IReportFeeStatisticsInnerServiceSMO
- * @Description 璐圭敤缁熻绫� 鏈嶅姟绫�
+ * @Description 鎶ヨ〃 鍩虹鏁版嵁缁熻琛�
* @Author wuxw
* @Date 2019/4/24 9:04
* @Version 1.0
@@ -24,79 +23,42 @@
/**
- * <p>鏌ヨ鍘嗗彶鏈堟瑺璐�</p>
+ * <p>鏌ヨ鎴垮眿鎬绘暟</p>
*
- * @param queryFeeStatisticsDto 鏁版嵁瀵硅薄鍒嗕韩
+ * @param roomDto 鏁版嵁瀵硅薄鍒嗕韩
*/
- @RequestMapping(value = "/getHisMonthOweFee", method = RequestMethod.POST)
- double getHisMonthOweFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
+ @RequestMapping(value = "/getRoomCount", method = RequestMethod.POST)
+ long getRoomCount(@RequestBody RoomDto roomDto);
- /**
- * 鏌ヨ褰撴湀娆犺垂
- *
- * @param queryFeeStatisticsDto
- * @return
- */
- @RequestMapping(value = "/getCurMonthOweFee", method = RequestMethod.POST)
- double getCurMonthOweFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
/**
- * 鏌ヨ褰撴湀搴旀敹
+ * <p>鏌ヨ鎴垮眿</p>
*
- * @param queryStatisticsDto
- * @return
+ * @param roomDto 鏁版嵁瀵硅薄鍒嗕韩
*/
- @RequestMapping(value = "/getCurReceivableFee", method = RequestMethod.POST)
- double getCurReceivableFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
-
- @RequestMapping(value = "/getHisReceivedFee", method = RequestMethod.POST)
- double getHisReceivedFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
-
- @RequestMapping(value = "/getPreReceivedFee", method = RequestMethod.POST)
- double getPreReceivedFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
-
- @RequestMapping(value = "/getReceivedFee", method = RequestMethod.POST)
- double getReceivedFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
+ @RequestMapping(value = "/getRoomInfo", method = RequestMethod.POST)
+ List<RoomDto> getRoomInfo(@RequestBody RoomDto roomDto);
/**
- * 娆犺垂鎴锋暟
- *
- * @param queryStatisticsDto
+ * 鏌ヨ瀹炴敹鎴垮眿鏁�
+ * @param roomDto
* @return
*/
+ @RequestMapping(value = "/getReceivedRoomCount", method = RequestMethod.POST)
+ long getReceivedRoomCount(@RequestBody RoomDto roomDto);
+
+ /**
+ * 鏌ヨ瀹炴敹鎴垮眿
+ * @param roomDto
+ * @return
+ */
+ @RequestMapping(value = "/getReceivedRoomInfo", method = RequestMethod.POST)
+ List<RoomDto> getReceivedRoomInfo(@RequestBody RoomDto roomDto);
+
@RequestMapping(value = "/getOweRoomCount", method = RequestMethod.POST)
- int getOweRoomCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
+ long getOweRoomCount(@RequestBody RoomDto roomDto);
- /**
- * 鏌ヨ鏀惰垂鎴垮眿鏁�
- *
- * @param queryStatisticsDto
- * @return
- */
- @RequestMapping(value = "/getFeeRoomCount", method = RequestMethod.POST)
- long getFeeRoomCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
-
- /**
- * 妤兼爧鏀惰垂鐜囦俊鎭粺璁�
- *
- * @param queryStatisticsDto
- * @return
- */
- @RequestMapping(value = "/getFloorFeeSummary", method = RequestMethod.POST)
- List<Map> getFloorFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto);
-
- /**
- * 璐圭敤椤规敹璐圭巼缁熻
- * @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);
+ @RequestMapping(value = "/getOweRoomInfo", method = RequestMethod.POST)
+ List<RoomDto> getOweRoomInfo(@RequestBody RoomDto roomDto);
}
--
Gitblit v1.8.0