From cb9b7c03dcd829c8c55b20170a2c41d25d5acbe1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 七月 2026 09:55:52 +0800
Subject: [PATCH] Merge branch '2.2' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.2
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
index 12bfda9..e3e82cf 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
@@ -20,6 +20,7 @@
import com.ruoyi.order.api.vo.TOrderInvoiceVO;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.export.OrderInvoiceExport;
+import com.ruoyi.order.export.InvoiceApplicationWorkbookBuilder;
import com.ruoyi.order.service.TOrderInvoiceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -222,18 +223,7 @@
}
private Workbook buildInvoiceWorkbook(TOrderInvoiceVO invoice) {
- OrderInvoiceExport export = new OrderInvoiceExport();
- BeanUtils.copyProperties(invoice, export);
- if (invoice.getCreateTime() != null) {
- export.setApplyTime(DateUtils.localDateTimeToString(invoice.getCreateTime()));
- }
- if (invoice.getBillingTime() != null) {
- export.setBillingTime(DateUtils.localDateTimeToString(invoice.getBillingTime()));
- }
- return ExcelExportUtil.exportExcel(
- new ExportParams(),
- OrderInvoiceExport.class,
- new ArrayList<>(Collections.singletonList(export)));
+ return InvoiceApplicationWorkbookBuilder.build(invoice);
}
private String buildInvoiceFileName(TOrderInvoiceVO invoice) {
--
Gitblit v1.7.1