diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java index 1b87dc5b..0bd01d70 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java @@ -35,6 +35,7 @@ import com.bms.ar.domain.vo.ArBillGeneratePreviewExportRow; import com.bms.ar.domain.vo.ArBillGenerateRequest; import com.bms.ar.domain.vo.ArBillListExportRow; import com.bms.ar.domain.vo.ArBillQuery; +import com.bms.ar.enums.ArBillDateType; import com.bms.ar.service.IArBillService; import com.bms.ar.security.ArBillScopeResolver; import com.bms.common.annotation.Log; @@ -181,12 +182,18 @@ public class ArBillController extends BaseController { public void exportGeneratePreview(HttpServletResponse response, ArBillGenerateQuery query, HttpServletRequest request) { rejectMultiValueParameter(request, "customerId"); - List bills = billService.previewBill(query == null ? new ArBillGenerateQuery() : query); + ArBillGenerateQuery exportQuery = query == null ? new ArBillGenerateQuery() : query; + List bills = billService.previewBill(exportQuery); List rows = new ArrayList<>(bills.size()); for (PrcOrderBill bill : bills) { rows.add(ArBillGeneratePreviewExportRow.from(bill)); } ExcelUtil util = new ExcelUtil<>(ArBillGeneratePreviewExportRow.class); + if (ArBillDateType.PICKUP_DATE == ArBillDateType.of(exportQuery.getDateType())) { + util.hideColumn("bizDate"); + } else { + util.hideColumn("pickupDate"); + } util.exportExcel(response, rows, "应收账单待生成订单"); } diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java index e91bb7f1..e7f1f235 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java @@ -25,9 +25,12 @@ public class ArBillGeneratePreviewExportRow implements Serializable { @Excel(name = "客户", sort = 3, width = 24) private String customerName; - @Excel(name = "业务日期", sort = 4, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 22) + @Excel(name = "计费时间", sort = 4, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 22) private Date bizDate; + @Excel(name = "收货时间", sort = 4, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 22) + private Date pickupDate; + @Excel(name = "产品", sort = 5, width = 22) private String productName; @@ -53,6 +56,7 @@ public class ArBillGeneratePreviewExportRow implements Serializable { row.setTransferNo(bill.getTransferNo()); row.setCustomerName(bill.getCustomerName()); row.setBizDate(bill.getBizDate()); + row.setPickupDate(bill.getPickupDate()); row.setProductName(bill.getProductName()); row.setCountryName(bill.getCountryName()); row.setActualWeight(bill.getActualWeight());