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/QueryReportFloorFeeSummaryCmd.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFloorFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFloorFeeSummaryCmd.java
index fed9613..d85921a 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFloorFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFloorFeeSummaryCmd.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.setFeeTypeCd(reqJson.getString("feeTypeCd"));
if(reqJson.containsKey("configIds")){
queryStatisticsDto.setConfigIds(reqJson.getString("configIds").split(","));
@@ -53,11 +56,8 @@
BigDecimal feeRoomCountDec = null;
BigDecimal oweRoomCountDec = null;
BigDecimal feeRoomRate = null;
- BigDecimal hisOweFee = null;
+ BigDecimal curReceivedFee = null;
BigDecimal curReceivableFee = null;
- BigDecimal hisReceivedFee = null;
- BigDecimal receivedFee = null;
- BigDecimal preReceivedFee = null;
for(Map data:datas){
//todo 璁＄畻 鎴锋敹璐圭巼
if(Double.parseDouble(data.get("feeRoomCount").toString())>0){
@@ -70,15 +70,11 @@
}
//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()));
- hisReceivedFee = new BigDecimal(Double.parseDouble(data.get("hisReceivedFee").toString()));
- hisOweFee = curReceivableFee.add(hisOweFee).add(hisReceivedFee);
- 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