修正表头错误的bug
This commit is contained in:
@@ -397,17 +397,29 @@ public class LbDailyUserTradeReportController {
|
|||||||
.orderByDesc(LbDailyUserTradeReport::getCreatedAt);
|
.orderByDesc(LbDailyUserTradeReport::getCreatedAt);
|
||||||
|
|
||||||
List<LbDailyUserTradeReport> rows = lbDailyUserTradeReportService.list(queryWrapper);
|
List<LbDailyUserTradeReport> rows = lbDailyUserTradeReportService.list(queryWrapper);
|
||||||
rows.sort(Comparator.comparingInt(o -> "report_sum".equals(o.getDataType()) ? 1 : 0));
|
rows.sort(
|
||||||
|
Comparator
|
||||||
|
.comparingInt((LbDailyUserTradeReport o) -> "report_sum".equals(o.getDataType()) ? 1 : 0)
|
||||||
|
.thenComparing((a, b) -> {
|
||||||
|
BigDecimal da = a.getDiffAmt() == null ? BigDecimal.ZERO : a.getDiffAmt();
|
||||||
|
BigDecimal db = b.getDiffAmt() == null ? BigDecimal.ZERO : b.getDiffAmt();
|
||||||
|
return db.compareTo(da);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
try (Workbook workbook = new XSSFWorkbook()) {
|
try (Workbook workbook = new XSSFWorkbook()) {
|
||||||
Sheet sheet = workbook.createSheet("report");
|
Sheet sheet = workbook.createSheet("report");
|
||||||
|
|
||||||
|
DateTimeFormatter mmdd = DateTimeFormatter.ofPattern("MM-dd");
|
||||||
|
String d0 = parsedReportDate.format(mmdd);
|
||||||
|
String d1 = parsedReportDate.minusDays(1).format(mmdd);
|
||||||
|
|
||||||
int r = 0;
|
int r = 0;
|
||||||
Row header = sheet.createRow(r++);
|
Row header = sheet.createRow(r++);
|
||||||
header.createCell(0).setCellValue("昵称");
|
header.createCell(0).setCellValue("昵称");
|
||||||
header.createCell(1).setCellValue(parsedReportDate.minusDays(1) + "买货");
|
header.createCell(1).setCellValue(d1 + "买货");
|
||||||
header.createCell(2).setCellValue(parsedReportDate + "卖货");
|
header.createCell(2).setCellValue(d0 + "卖货");
|
||||||
header.createCell(3).setCellValue(parsedReportDate + "买货");
|
header.createCell(3).setCellValue(d0 + "买货");
|
||||||
header.createCell(4).setCellValue("服务费");
|
header.createCell(4).setCellValue("服务费");
|
||||||
header.createCell(5).setCellValue("差额");
|
header.createCell(5).setCellValue("差额");
|
||||||
header.createCell(6).setCellValue("应收应付");
|
header.createCell(6).setCellValue("应收应付");
|
||||||
|
|||||||
Reference in New Issue
Block a user