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/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 8b53b74..097a96f 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鏃� 涓嶇劧鍘嗗彶鍜屾�绘瑺璐逛竴鏍锋湁鐐瑰鎬�
@@ -148,6 +146,10 @@
         double monthReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
         data.put("monthReceivedRoomCount", monthReceivedRoomCount);
 
+        // todo 鏌ヨ鏀惰垂鎴�
+        long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
+        data.put("feeRoomCount", feeRoomCount);
+
         // todo 璁$畻娆犺垂鎴�
         int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
         data.put("oweRoomCount", oweRoomCount);

--
Gitblit v1.8.0