From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java b/server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java
index 8358d4e..5b82ada 100644
--- a/server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java
@@ -6,6 +6,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.model.WxBill;
import com.doumee.dao.business.model.WxBillDetail;
import com.doumee.service.business.WxBillDetailService;
import io.swagger.annotations.Api;
@@ -78,7 +80,14 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:wxbilldetail:exportExcel")
public void exportExcel (@RequestBody PageWrap<WxBillDetail> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(WxBillDetail.class).export(wxBillDetailService.findPage(pageWrap).getRecords(), "WxBillDetailController", response);
+ ExcelExporter.build(WxBillDetail.class).exportWithFirstAndEnd(wxBillDetailService.findPage(pageWrap).getRecords(), "瀵硅处鏄庣粏_"+System.currentTimeMillis(),"瀵硅处鏄庣粏_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+// ExcelExporter.build(WxBillDetail.class).exportWithFirstAndEnd(wxBillDetailService.findPage(pageWrap).getRecords(), "WxBillDetailController", response);
+ }
+ @ApiOperation("闈炶嚜琛岃溅鏀跺叆_瀵煎嚭Excel")
+ @PostMapping("/exportNotBikeExcel")
+ @RequiresPermissions("business:wxbilldetail:exportExcel")
+ public void exportNotBikeExcel (@RequestBody PageWrap<WxBillDetail> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(WxBillDetail.class).exportWithFirstAndEnd(wxBillDetailService.findPage(pageWrap).getRecords(), "闈炶嚜琛岃溅鏀跺叆_"+System.currentTimeMillis(),"闈炶嚜琛岃溅鏀跺叆_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
--
Gitblit v1.9.3