|
|
@ -342,12 +342,15 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
|
|
|
|
ZipOutputStream zos = new ZipOutputStream(ous);
|
|
|
|
ZipOutputStream zos = new ZipOutputStream(ous);
|
|
|
|
for (JSONObject log : logs) {
|
|
|
|
for (JSONObject log : logs) {
|
|
|
|
String dateString = DateFormatUtils.format(log.getDate("operate_time"), "yyyyMMddHHmmss");
|
|
|
|
String dateString = DateFormatUtils.format(log.getDate("operate_time"), "yyyyMMddHHmmss");
|
|
|
|
String filename = "Merchant_Settlement_Info_" + dateString + RandomStringUtils.random(8, false, true) + ".xlsx";
|
|
|
|
|
|
|
|
zos.putNextEntry(new ZipEntry(filename));
|
|
|
|
|
|
|
|
List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));
|
|
|
|
List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));
|
|
|
|
byte[] xlsx = generateSettleXlsxFile(dt, details, null);
|
|
|
|
List<String> bankList = details.stream().map(detail -> detail.getString("settle_bank")).distinct().collect(Collectors.toList());
|
|
|
|
|
|
|
|
for (String bank : bankList) {
|
|
|
|
|
|
|
|
String filename = "Merchant_Settlement_Info_" + dateString + "_" + bank + ".xlsx";
|
|
|
|
|
|
|
|
zos.putNextEntry(new ZipEntry(filename));
|
|
|
|
|
|
|
|
byte[] xlsx = generateSettleXlsxFile(dt, details, bank);
|
|
|
|
IOUtils.write(xlsx, zos);
|
|
|
|
IOUtils.write(xlsx, zos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
zos.flush();
|
|
|
|
zos.flush();
|
|
|
|
IOUtils.closeQuietly(zos);
|
|
|
|
IOUtils.closeQuietly(zos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|