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 | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 580bf1c..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
@@ -1,6 +1,7 @@
package com.java110.fee.bmo.feeReceipt.impl;
import com.java110.dto.feeReceipt.FeeReceiptDto;
+import com.java110.dto.feeReceipt.FeeReceiptDtoNew;
import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;
import com.java110.intf.fee.IFeeReceiptInnerServiceSMO;
import com.java110.vo.ResultVo;
@@ -28,8 +29,40 @@
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, feeReceiptList);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+ return responseEntity;
+ }
+
+
+ @Override
+ public ResponseEntity<String> gets(FeeReceiptDtoNew feeReceiptDtonew) {
+ FeeReceiptDto feeReceiptDto = new FeeReceiptDto();
+ feeReceiptDto.setPage(feeReceiptDtonew.getPage());
+ feeReceiptDto.setRow(feeReceiptDtonew.getRow());
+ feeReceiptDto.setCommunityId(feeReceiptDtonew.getCommunityId());
+ feeReceiptDto.setReceiptId(feeReceiptDtonew.getReceiptId());
+ feeReceiptDto.setObjType(feeReceiptDto.getObjType());
+ feeReceiptDto.setObjName(feeReceiptDto.getObjName());
+ int count = feeReceiptInnerServiceSMOImpl.queryFeeReceiptsCount(feeReceiptDto);
+
+ List<FeeReceiptDtoNew> feeReceiptDtos = null;
+ if (count > 0) {
+ feeReceiptDtos = feeReceiptInnerServiceSMOImpl.queryFeeReceiptsNew(feeReceiptDtonew);
} else {
feeReceiptDtos = new ArrayList<>();
}
@@ -40,5 +73,4 @@
return responseEntity;
}
-
}
--
Gitblit v1.8.0