From ac82dee75615f23ba1ca141314cc45b8a7170b00 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 12 八月 2021 22:34:40 +0800
Subject: [PATCH] 优化字母车位费用问题
---
service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 289d3bb..b678b44 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,5 +1,6 @@
package com.java110.report.bmo.reportOweFee.impl;
+import com.java110.dto.PageDto;
import com.java110.dto.reportOweFee.ReportOweFeeDto;
import com.java110.dto.reportOweFee.ReportOweFeeItemDto;
import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
@@ -34,15 +35,28 @@
int count = reportOweFeeInnerServiceSMOImpl.queryReportOweFeesCount(reportOweFeeDto);
- List<ReportOweFeeDto> reportOweFeeDtos = null;
+ List<ReportOweFeeDto> reportOweFeeDtos = new ArrayList<>();
if (count > 0) {
- reportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportOweFees(reportOweFeeDto);
- refreshReportOwe(reportOweFeeDtos, reportOweFeeDto.getConfigIds());
+ reportOweFeeDto.setPage(PageDto.DEFAULT_PAGE);
+ List<ReportOweFeeDto> reportOweFees = reportOweFeeInnerServiceSMOImpl.queryReportOweFees(reportOweFeeDto);
+ refreshReportOwe(reportOweFees, reportOweFeeDto.getConfigIds());
+ for (ReportOweFeeDto reportOweFee : reportOweFees) {
+ //鑾峰彇娆犺垂鎬婚噾棰�
+ String amountOwed = reportOweFee.getAmountOwed();
+ if (!StringUtil.isEmpty(amountOwed)) {
+ double amountOwedMoney = Double.parseDouble(amountOwed);
+ if (amountOwedMoney > 0.0) {
+ reportOweFeeDtos.add(reportOweFee);
+ } else {
+ continue;
+ }
+ }
+ }
} else {
reportOweFeeDtos = new ArrayList<>();
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportOweFeeDto.getRow()), count, reportOweFeeDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) reportOweFeeDtos.size() / (double) reportOweFeeDto.getRow()), reportOweFeeDtos.size(), reportOweFeeDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
@@ -57,7 +71,6 @@
*/
@Override
public ResponseEntity<String> getAllFees(ReportOweFeeDto reportOweFeeDto) {
- //
List<ReportOweFeeDto> allReportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFees(reportOweFeeDto);
if (allReportOweFeeDtos == null || allReportOweFeeDtos.size() < 1) {
return ResultVo.createResponseEntity(allReportOweFeeDtos);
@@ -208,7 +221,7 @@
oldAmount = oldAmount.add(new BigDecimal(Double.parseDouble(reportOweFeeDto.getAmountOwed()))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
reportOweFeeItemDto.setAmountOwed(oldAmount.doubleValue() + "");
}
- if(!StringUtil.isEmpty(reportOweFeeDto.getOwnerName()) && StringUtil.isEmpty(oldReportOweFeeDto.getOwnerName())) {
+ if (!StringUtil.isEmpty(reportOweFeeDto.getOwnerName()) && StringUtil.isEmpty(oldReportOweFeeDto.getOwnerName())) {
oldReportOweFeeDto.setOwnerName(reportOweFeeDto.getOwnerName());
}
oldReportOweFeeDto.setUpdateTime(reportOweFeeDto.getUpdateTime());
--
Gitblit v1.8.0