From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java
index 653b818..7ea7753 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java
@@ -107,9 +107,7 @@
long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
data.put("roomCount", roomCount);
- // todo 鏌ヨ绌虹疆鎴锋暟
- long freeCount = baseDataStatisticsImpl.getFreeRoomCount(queryStatisticsDto);
- data.put("freeCount", freeCount);
+
// todo 鏌ヨ 鍘嗗彶娆犺垂
//杩欓噷璁剧疆鏌ヨ鏈�1鏃� 涓嶇劧鍘嗗彶鍜屾�绘瑺璐逛竴鏍锋湁鐐瑰鎬�
@@ -145,15 +143,19 @@
// todo 鏈湀宸叉敹鎴�
queryStatisticsDto.setStartDate(monthFastDate);
queryStatisticsDto.setEndDate(monthLastDate);
- double monthReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
+ double monthReceivedRoomCount = feeStatisticsImpl.getMonthReceivedDetailCount(queryStatisticsDto);
data.put("monthReceivedRoomCount", monthReceivedRoomCount);
+
+ // todo 鏌ヨ鏀惰垂鎴�
+ long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
+ data.put("feeRoomCount", feeRoomCount);
// todo 璁＄畻娆犺垂鎴�
int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
- data.put("monthReceivedRoomCount", oweRoomCount);
+ data.put("oweRoomCount", oweRoomCount);
- // todo 宸叉敹閲戦
- double monthReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
+ // todo 鏈湀宸叉敹閲戦
+ double monthReceivedRoomAmount = feeStatisticsImpl.getMonthReceivedDetailAmount(queryStatisticsDto);
data.put("monthReceivedRoomAmount", monthReceivedRoomAmount);
// todo 鍓╀綑鏈敹
double curMonthOweFee = feeStatisticsImpl.getCurMonthOweFee(queryStatisticsDto);
@@ -165,17 +167,17 @@
double curReceivableFee = feeStatisticsImpl.getCurReceivableFee(queryStatisticsDto);
data.put("curReceivableFee", curReceivableFee);
- //todo 鏌ヨ 娆犺垂杩藉洖
- queryStatisticsDto.setStartDate(monthFastDate);
- queryStatisticsDto.setEndDate(monthLastDate);
- double hisReceivedFee = feeStatisticsImpl.getHisReceivedFee(queryStatisticsDto);
- data.put("hisReceivedFee", hisReceivedFee);
-
- //todo 鏌ヨ 棰勪氦璐圭敤
- queryStatisticsDto.setStartDate(monthFastDate);
- queryStatisticsDto.setEndDate(monthLastDate);
- double preReceivedFee = feeStatisticsImpl.getPreReceivedFee(queryStatisticsDto);
- data.put("preReceivedFee", preReceivedFee);
+// //todo 鏌ヨ 娆犺垂杩藉洖
+// queryStatisticsDto.setStartDate(monthFastDate);
+// queryStatisticsDto.setEndDate(monthLastDate);
+// double hisReceivedFee = feeStatisticsImpl.getHisReceivedFee(queryStatisticsDto);
+// data.put("hisReceivedFee", hisReceivedFee);
+//
+// //todo 鏌ヨ 棰勪氦璐圭敤
+// queryStatisticsDto.setStartDate(monthFastDate);
+// queryStatisticsDto.setEndDate(monthLastDate);
+// double preReceivedFee = feeStatisticsImpl.getPreReceivedFee(queryStatisticsDto);
+// data.put("preReceivedFee", preReceivedFee);
datas.add(data);
--
Gitblit v1.8.0