From e76458b9568be1b8b9c360b2d9207f5f2c1a3bcf Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 24 五月 2021 10:46:27 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java
index 39164ca..857edf1 100644
--- a/service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java
@@ -5,6 +5,7 @@
import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
import com.java110.report.bmo.reportOweFee.IGetReportOweFeeBMO;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -190,10 +191,12 @@
items.add(reportOweFeeItemDto);
} else {
BigDecimal oldAmount = new BigDecimal(Double.parseDouble(reportOweFeeItemDto.getAmountOwed()));
- oldAmount = oldAmount.add(new BigDecimal(Double.parseDouble(reportOweFeeDto.getAmountOwed())));
+ oldAmount = oldAmount.add(new BigDecimal(Double.parseDouble(reportOweFeeDto.getAmountOwed()))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
reportOweFeeItemDto.setAmountOwed(oldAmount.doubleValue() + "");
}
- oldReportOweFeeDto.setOwnerName(reportOweFeeDto.getOwnerName());
+ if(!StringUtil.isEmpty(reportOweFeeDto.getOwnerName())) {
+ oldReportOweFeeDto.setOwnerName(reportOweFeeDto.getOwnerName());
+ }
oldReportOweFeeDto.setUpdateTime(reportOweFeeDto.getUpdateTime());
oldReportOweFeeDto.setConfigName(reportOweFeeDto.getConfigName());
}
@@ -213,9 +216,9 @@
endTime = tempReportOweFeeItemDto.getEndTime();
}
if (endTime.getTime() < tempReportOweFeeItemDto.getEndTime().getTime()) {
- endTime = tempReportOweFeeItemDto.getStartTime();
+ endTime = tempReportOweFeeItemDto.getEndTime();
}
- totalAmount = totalAmount.add(new BigDecimal(Double.parseDouble(tempReportOweFeeItemDto.getAmountOwed())));
+ totalAmount = totalAmount.add(new BigDecimal(Double.parseDouble(tempReportOweFeeItemDto.getAmountOwed()))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
}
oldReportOweFeeDto.setEndTime(DateUtil.getFormatTimeString(startTime, DateUtil.DATE_FORMATE_STRING_A));
oldReportOweFeeDto.setDeadlineTime(DateUtil.getFormatTimeString(endTime, DateUtil.DATE_FORMATE_STRING_A));
--
Gitblit v1.8.0