From 4bb094afa0f764e3f36d5ef0d239f398b6e643f8 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 14 Feb 2020 16:59:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20summary=E4=B8=8B=E8=BD=BD20=E6=9D=A1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/tradelog/core/impls/TradeLogServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 030e03b29..2ae702621 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.33 + 1.3.34 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index baac2647e..cbff91bbc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -991,14 +991,14 @@ public class TradeLogServiceImpl implements TradeLogService { JSONObject params = query.toParams(timezone); params.put("client_id", clientId); PageList logs = transactionMapper.listSettlementLog(params, - new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc"))); + new PageBounds(query.getPage(), 100000000, Order.formString("clearing_time.desc"))); try (HSSFWorkbook workbook = new HSSFWorkbook()) { if (query.getClient_ids() == null) { addSheet(0, workbook, client, logs); List childs = clientMapper.listChildClients(client.getIntValue("client_id")); for (int i = 0; i < childs.size(); i++) { params.put("client_id", childs.get(i).getInteger("client_id")); - PageList childLogs = transactionMapper.listSettlementLog(params, new PageBounds(query.getPage(), 10000, Order.formString("clearing_time.desc"))); + PageList childLogs = transactionMapper.listSettlementLog(params, new PageBounds(query.getPage(), 100000000, Order.formString("clearing_time.desc"))); if (childLogs.size() > 0) { addSheet(i + 1, workbook, childs.get(i), childLogs); }