From 634cea842c9a4f2ef1bddde07d7b5a334f0117de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 十二月 2020 11:02:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java
index a818805..9be0c3a 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java
@@ -29,13 +29,19 @@
int count = feeReceiptInnerServiceSMOImpl.queryFeeReceiptsCount(feeReceiptDto);
List<FeeReceiptDto> feeReceiptDtos = null;
+ List<FeeReceiptDto> feeReceiptList = new ArrayList<>();
if (count > 0) {
feeReceiptDtos = feeReceiptInnerServiceSMOImpl.queryFeeReceipts(feeReceiptDto);
+ for (FeeReceiptDto feeReceipt : feeReceiptDtos) {
+ feeReceipt.setStoreName(feeReceiptDto.getStoreName());
+ feeReceiptList.add(feeReceipt);
+ }
} else {
feeReceiptDtos = new ArrayList<>();
+ feeReceiptList.addAll(feeReceiptDtos);
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) feeReceiptDto.getRow()), count, feeReceiptDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) feeReceiptDto.getRow()), count, feeReceiptList);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
--
Gitblit v1.8.0