From 47a0da038edf0d7743662fd65666d2f49e841818 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 九月 2024 18:35:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 5bbdf95..1b2dfc4 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
@@ -84,9 +84,9 @@
/**
* 发票管理导出
*/
- @ApiOperation(value = "发票管理导出")
+ @ApiOperation(value = "发票管理导出", tags = {"管理后台-发票管理"})
@Log(title = "发票管理导出", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
+ @PutMapping("/export")
public void export(@RequestBody TOrderInvoiceQuery query)
{
List<TOrderInvoiceVO> list = orderInvoiceService.export(query);
@@ -94,7 +94,9 @@
for (TOrderInvoiceVO orderInvoiceVO : list) {
OrderInvoiceExport orderInvoiceExport = new OrderInvoiceExport();
BeanUtils.copyProperties(orderInvoiceVO,orderInvoiceExport);
- orderInvoiceExport.setBillingTime(DateUtils.localDateTimeToString(orderInvoiceVO.getBillingTime()));
+ if (orderInvoiceVO.getBillingTime()!=null){
+ orderInvoiceExport.setBillingTime(DateUtils.localDateTimeToString(orderInvoiceVO.getBillingTime()));
+ }
orderInvoiceExports.add(orderInvoiceExport);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), OrderInvoiceExport.class, orderInvoiceExports);
--
Gitblit v1.7.1