From 900829daab40ea7e29440c9de75592cd58a7562a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 15:52:03 +0800
Subject: [PATCH] optimize
---
service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java | 16 ++++++++++++++--
1 files changed, 14 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 ccd29d8..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,12 +78,22 @@
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);
//todo 鏌ヨ 鍗曟湀娆犺垂
double curOweFee = feeStatisticsImpl.getCurMonthOweFee(queryStatisticsDto);
+
+ //todo 鏌ヨ褰撴湀搴旀敹
+ double curReceivableFee = feeStatisticsImpl.getCurReceivableFee(queryStatisticsDto);
//todo 鏌ヨ 娆犺垂杩藉洖
double hisReceivedFee = feeStatisticsImpl.getHisReceivedFee(queryStatisticsDto);
@@ -98,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);
@@ -110,8 +120,10 @@
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);
+
JSONArray datas = new JSONArray();
datas.add(data);
context.setResponseEntity(ResultVo.createResponseEntity(datas));
--
Gitblit v1.8.0