|
|
@ -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(), query.getLimit(), Order.formString("clearing_time.desc")));
|
|
|
|
new PageBounds(query.getPage(), 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(), 10000, Order.formString("clearing_time.desc")));
|
|
|
|
PageList<JSONObject> childLogs = transactionMapper.listSettlementLog(params, new PageBounds(query.getPage(), 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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|