From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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..289d3bb 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;
-
-
/**
@@ -138,9 +135,23 @@
ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
reportOweFeeDto.setPayerObjIds(payObjIds.toArray(new String[payObjIds.size()]));
List<ReportOweFeeDto> allReportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFees(reportOweFeeDto);
-
+ List<ReportOweFeeDto> reportOweFeeDtos = new ArrayList<>();
+ for (ReportOweFeeDto reportOweFee : allReportOweFeeDtos) {
+ ReportOweFeeDto reportOwe = new ReportOweFeeDto();
+ reportOwe.setOweId(reportOweFee.getOweId());
+ if (reportOweFee.getPayerObjType().equals("3333")) {
+ List<ReportOweFeeDto> reportOweFees = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFeesByRoom(reportOwe);
+ reportOweFee.setOweId(reportOweFees.get(0).getOweId());
+ reportOweFee.setOwnerName(reportOweFees.get(0).getOwnerName());
+ } else if (reportOweFee.getPayerObjType().equals("6666")) {
+ List<ReportOweFeeDto> reportOweFees = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFeesByCar(reportOwe);
+ reportOweFee.setOweId(reportOweFees.get(0).getOweId());
+ reportOweFee.setOwnerName(reportOweFees.get(0).getOwnerName());
+ }
+ reportOweFeeDtos.add(reportOweFee);
+ }
for (ReportOweFeeDto tmpReportOweFeeDto : oldReportOweFeeDtos) {
- dealItem(tmpReportOweFeeDto, allReportOweFeeDtos);
+ dealItem(tmpReportOweFeeDto, reportOweFeeDtos);
}
if (configIds == null || configIds.length < 1) {
@@ -184,6 +195,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 +205,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 +230,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