fix summary下载20条问题

master
luoyang 5 years ago
parent 4bb094afa0
commit 4fabe349cd

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.3.34</version> <version>1.3.35</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version> <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

@ -991,14 +991,14 @@ public class TradeLogServiceImpl implements TradeLogService {
JSONObject params = query.toParams(timezone); JSONObject params = query.toParams(timezone);
params.put("client_id", clientId); params.put("client_id", clientId);
PageList<JSONObject> logs = transactionMapper.listSettlementLog(params, PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
new PageBounds(query.getPage(), 100000000, Order.formString("clearing_time.desc"))); new PageBounds(1, 100000000, Order.formString("clearing_time.desc")));
try (HSSFWorkbook workbook = new HSSFWorkbook()) { try (HSSFWorkbook workbook = new HSSFWorkbook()) {
if (query.getClient_ids() == null) { if (query.getClient_ids() == null) {
addSheet(0, workbook, client, logs); addSheet(0, workbook, client, logs);
List<JSONObject> childs = clientMapper.listChildClients(client.getIntValue("client_id")); List<JSONObject> childs = clientMapper.listChildClients(client.getIntValue("client_id"));
for (int i = 0; i < childs.size(); i++) { for (int i = 0; i < childs.size(); i++) {
params.put("client_id", childs.get(i).getInteger("client_id")); params.put("client_id", childs.get(i).getInteger("client_id"));
PageList<JSONObject> childLogs = transactionMapper.listSettlementLog(params, new PageBounds(query.getPage(), 100000000, Order.formString("clearing_time.desc"))); PageList<JSONObject> childLogs = transactionMapper.listSettlementLog(params, new PageBounds(1, 100000000, Order.formString("clearing_time.desc")));
if (childLogs.size() > 0) { if (childLogs.size() > 0) {
addSheet(i + 1, workbook, childs.get(i), childLogs); addSheet(i + 1, workbook, childs.get(i), childLogs);
} }

Loading…
Cancel
Save