From 0e0e1f080d4a986ca75cde7cf5d23b2f8539fb10 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 17 五月 2023 12:25:35 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
index 64befef..cd14232 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
@@ -78,6 +78,13 @@
queryStatisticsDto.setConfigId(reqJson.getString("configId"));
queryStatisticsDto.setFloorId(reqJson.getString("floorId"));
queryStatisticsDto.setObjName(reqJson.getString("objName"));
+ queryStatisticsDto.setFeeTypeCd(reqJson.getString("feeTypeCd"));
+ queryStatisticsDto.setOwnerName(reqJson.getString("ownerName"));
+ queryStatisticsDto.setLink(reqJson.getString("link"));
+
+ if(reqJson.containsKey("configIds")){
+ queryStatisticsDto.setConfigIds(reqJson.getString("configIds").split(","));
+ }
//todo 鏌ヨ鍘嗗彶娆犺垂
double hisOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
@@ -101,7 +108,7 @@
long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
//todo 绌洪棽鎴垮眿鏁�
- long freeRoomCount = baseDataStatisticsImpl.getFreeRoomCount(queryStatisticsDto);
+ long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
//todo 娆犺垂鎴锋暟
int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
@@ -113,7 +120,7 @@
data.put("preReceivedFee", preReceivedFee);
data.put("receivedFee", receivedFee);
data.put("roomCount", roomCount);
- data.put("freeRoomCount", freeRoomCount);
+ data.put("feeRoomCount", feeRoomCount);
data.put("oweRoomCount", oweRoomCount);
data.put("curReceivableFee", curReceivableFee);
--
Gitblit v1.8.0