From 732f08830fc255e23c8665c0bbe7c298f7a2e36d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 02 九月 2024 19:19:36 +0800
Subject: [PATCH] 一次性费用合并
---
service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 51acf50..708912a 100755
--- 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
@@ -11,14 +11,15 @@
import com.java110.intf.fee.IFeeReceiptInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
@Service("getFeeReceiptBMOImpl")
public class GetFeeReceiptBMOImpl implements IGetFeeReceiptBMO {
@@ -45,27 +46,27 @@
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);
}
//杈撳叆鎴垮眿淇℃伅
freshRoomInfo(feeReceiptDtos);
} else {
feeReceiptDtos = new ArrayList<>();
- feeReceiptList.addAll(feeReceiptDtos);
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) feeReceiptDto.getRow()), count, feeReceiptList);
+
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) feeReceiptDto.getRow()), count, feeReceiptDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
return responseEntity;
}
+
/**
* 鍒峰叆鎴垮眿淇℃伅
*
--
Gitblit v1.8.0