From 3dfbf2598ab5b16ff76a99c7b75c889e261a08bb Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 18:00:58 +0800
Subject: [PATCH] 1、收银台费用计算后台计算2、优化显示细节问题
---
service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 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 b678b44..6e043f5 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,6 +1,5 @@
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;
@@ -32,31 +31,18 @@
*/
public ResponseEntity<String> get(ReportOweFeeDto reportOweFeeDto) {
-
+ reportOweFeeDto.setHasOweFee("Y");
int count = reportOweFeeInnerServiceSMOImpl.queryReportOweFeesCount(reportOweFeeDto);
- List<ReportOweFeeDto> reportOweFeeDtos = new ArrayList<>();
+ List<ReportOweFeeDto> reportOweFeeDtos = null;
if (count > 0) {
- 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;
- }
- }
- }
+ reportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportOweFees(reportOweFeeDto);
+ refreshReportOwe(reportOweFeeDtos, reportOweFeeDto.getConfigIds());
} else {
reportOweFeeDtos = new ArrayList<>();
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) reportOweFeeDtos.size() / (double) reportOweFeeDto.getRow()), reportOweFeeDtos.size(), reportOweFeeDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportOweFeeDto.getRow()), count, reportOweFeeDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
--
Gitblit v1.8.0