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/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java
index b5b4b5a..e029f5e 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java
@@ -39,6 +39,9 @@
queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
+ if(reqJson.containsKey("endDate") && !reqJson.getString("endDate").contains(":")) {
+ queryStatisticsDto.setEndDate(reqJson.getString("endDate") + " 23:59:59");
+ }
queryStatisticsDto.setFloorId(reqJson.getString("floorId"));
if (reqJson.containsKey("configIds")) {
queryStatisticsDto.setConfigIds(reqJson.getString("configIds").split(","));
@@ -53,10 +56,8 @@
BigDecimal feeRoomCountDec = null;
BigDecimal oweRoomCountDec = null;
BigDecimal feeRoomRate = null;
- BigDecimal hisOweFee = null;
+ BigDecimal curReceivedFee = null;
BigDecimal curReceivableFee = null;
- BigDecimal receivedFee = null;
- BigDecimal preReceivedFee = null;
for (Map data : datas) {
//todo 璁＄畻 鎴锋敹璐圭巼
if (Double.parseDouble(data.get("feeRoomCount").toString()) > 0) {
@@ -69,14 +70,12 @@
}
//todo 璁＄畻 鏀惰垂鐜�
- hisOweFee = new BigDecimal(Double.parseDouble(data.get("hisOweFee").toString()));
+ curReceivedFee = new BigDecimal(Double.parseDouble(data.get("curReceivedFee").toString()));
curReceivableFee = new BigDecimal(Double.parseDouble(data.get("curReceivableFee").toString()));
- hisOweFee = curReceivableFee.add(hisOweFee);
- if (hisOweFee.doubleValue() > 0) {
- receivedFee = new BigDecimal(Double.parseDouble(data.get("receivedFee").toString()));
- preReceivedFee = new BigDecimal(Double.parseDouble(data.get("preReceivedFee").toString()));
- feeRoomRate = receivedFee.subtract(preReceivedFee).divide(hisOweFee, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+
+ if (curReceivableFee.doubleValue() > 0) {
+ feeRoomRate = curReceivedFee.divide(curReceivableFee, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
data.put("feeRate", feeRoomRate.doubleValue());
} else {
data.put("feeRate", 0.0);
--
Gitblit v1.8.0