From f4f6ae0c036abb09dd7afbd463340adc81c8f22d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 06 二月 2024 21:51:33 +0800
Subject: [PATCH] 优化报表进度问题
---
service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailCarCmd.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailCarCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailCarCmd.java
index 5e3b33f..8f1de38 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailCarCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailCarCmd.java
@@ -13,6 +13,7 @@
import com.java110.report.statistics.IFeeStatistics;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.MoneyUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -118,6 +119,8 @@
BigDecimal oweFee = null;
BigDecimal receivedFee = null;
+ double oweFeeD = 0;
+ double receivedFeeD = 0;
for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
oweFee = new BigDecimal(0.00);
receivedFee = new BigDecimal(0.00);
@@ -127,13 +130,16 @@
continue;
}
- oweFee = oweFee.add(new BigDecimal(info.get("oweFee").toString()));
- receivedFee = receivedFee.add(new BigDecimal(info.get("receivedFee").toString()));
- data.put("oweFee" + info.get("feeTypeCd").toString(), info.get("oweFee"));
- data.put("receivedFee" + info.get("feeTypeCd").toString(), info.get("receivedFee"));
+ oweFeeD = Double.parseDouble(info.get("oweFee").toString());
+ receivedFeeD = Double.parseDouble(info.get("receivedFee").toString());
+
+ oweFee = oweFee.add(new BigDecimal(oweFeeD + ""));
+ receivedFee = receivedFee.add(new BigDecimal(receivedFeeD + ""));
+ data.put("oweFee" + info.get("feeTypeCd").toString(), MoneyUtil.computePriceScale(oweFeeD));
+ data.put("receivedFee" + info.get("feeTypeCd").toString(), MoneyUtil.computePriceScale(receivedFeeD));
}
- data.put("oweFee", oweFee.doubleValue());
- data.put("receivedFee", receivedFee.doubleValue());
+ data.put("oweFee", MoneyUtil.computePriceScale(oweFee.doubleValue()));
+ data.put("receivedFee", MoneyUtil.computePriceScale(receivedFee.doubleValue()));
}
return datas;
--
Gitblit v1.8.0