diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java index 7a46142d4..83e1eaf95 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java @@ -33,8 +33,8 @@ public class TableSummaryExportVo implements Serializable { /** * 台桌+日期 */ -// @ExcelIgnore -// private String tableConcatDate; + @ExcelIgnore + private String tableConcatDate; /** * 台桌 */ @@ -80,27 +80,27 @@ public class TableSummaryExportVo implements Serializable { /** * 单价 */ -// @ExcelProperty("单价") -// @ColumnWidth(10) -// private BigDecimal unitPrice; -// /** -// * 金额 -// */ -// @ExcelProperty("金额") -// @ColumnWidth(10) -// private BigDecimal amount; + @ExcelProperty("单价") + @ColumnWidth(10) + private BigDecimal unitPrice; + /** + * 金额 + */ + @ExcelProperty("金额") + @ColumnWidth(10) + private BigDecimal amount; /** * 销售额 */ @ExcelProperty("销售额") @ColumnWidth(10) private BigDecimal salesAmount; -// /** -// * 总销售额 -// */ -// @ExcelProperty("总销售额") -// @ColumnWidth(15) -// private BigDecimal totalSalesAmount; + /** + * 总销售额 + */ + @ExcelProperty("总销售额") + @ColumnWidth(15) + private BigDecimal totalSalesAmount; /** * 退单量 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java index 6686ddb35..44fdcefd3 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java @@ -29,7 +29,6 @@ public class TableSummaryServiceImpl implements TableSummaryService { private ShopTableOrderStatisticMapper shopTableOrderStatisticMapper; - @Override public List summaryExportList(TableSummaryParam param) { if (param.getBeginDate() == null && param.getEndDate() == null) { @@ -52,6 +51,7 @@ public class TableSummaryServiceImpl implements TableSummaryService { if (CollUtil.isEmpty(list)) { return List.of(); } + // 追加个空行用于处理表格样式 TableSummaryExportVo nullVo = new TableSummaryExportVo(); list.add(nullVo);