✨ 应收账单导出时间按筛选类型切换

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<PrcOrderBill> bills = billService.previewBill(query == null ? new ArBillGenerateQuery() : query);
+        ArBillGenerateQuery exportQuery = query == null ? new ArBillGenerateQuery() : query;
+        List<PrcOrderBill> bills = billService.previewBill(exportQuery);
         List<ArBillGeneratePreviewExportRow> rows = new ArrayList<>(bills.size());
         for (PrcOrderBill bill : bills) {
             rows.add(ArBillGeneratePreviewExportRow.from(bill));
         }
         ExcelUtil<ArBillGeneratePreviewExportRow> util = new ExcelUtil<>(ArBillGeneratePreviewExportRow.class);
+        if (ArBillDateType.PICKUP_DATE == ArBillDateType.of(exportQuery.getDateType())) {
+            util.hideColumn("bizDate");
+        } else {
+            util.hideColumn("pickupDate");
+        }
         util.exportExcel(response, rows, "应收账单待生成订单");
     }