From c8195a8a1c34b9fa8db9aa4dc340d4344044ce97 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 29 六月 2021 20:52:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 fec266f..e42c64e 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
@@ -1,12 +1,11 @@
package com.java110.report.bmo.reportOweFee.impl;
-import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.reportOweFee.ReportOweFeeDto;
import com.java110.dto.reportOweFee.ReportOweFeeItemDto;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
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;
@@ -24,8 +23,6 @@
@Autowired
private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;
-
-
/**
@@ -184,6 +181,7 @@
reportOweFeeItemDto.setAmountOwed(reportOweFeeDto.getAmountOwed());
reportOweFeeItemDto.setPayerObjId(reportOweFeeDto.getPayerObjId());
reportOweFeeItemDto.setPayerObjName(reportOweFeeDto.getPayerObjName());
+ reportOweFeeItemDto.setConfigName(reportOweFeeDto.getConfigName());
try {
reportOweFeeItemDto.setStartTime(DateUtil.getDateFromString(reportOweFeeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
reportOweFeeItemDto.setEndTime(DateUtil.getDateFromString(reportOweFeeDto.getDeadlineTime(), DateUtil.DATE_FORMATE_STRING_A));
@@ -193,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()) && StringUtil.isEmpty(oldReportOweFeeDto.getOwnerName())) {
+ oldReportOweFeeDto.setOwnerName(reportOweFeeDto.getOwnerName());
+ }
oldReportOweFeeDto.setUpdateTime(reportOweFeeDto.getUpdateTime());
oldReportOweFeeDto.setConfigName(reportOweFeeDto.getConfigName());
}
@@ -216,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