From aaad86fd88d60aa0ce6b95c1e1a0a56fe02ec97e Mon Sep 17 00:00:00 2001 From: wangshuai Date: Wed, 21 Aug 2024 09:08:15 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E5=AF=BC=E5=87=BA=E5=90=8D=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=9C=89=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusIntegralHistoryInfoController.java | 6 +++--- ruoyi-ui/src/views/statistics/integral/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java index 0504622..c03c134 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java @@ -77,10 +77,10 @@ public class BusIntegralHistoryInfoController extends BaseController public void export(HttpServletResponse response, String account, String expStartTime, String expEndTime) { expStartTime = expStartTime + " 00:00:00"; - expEndTime = expEndTime + " 23:59:59"; - List list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList1(account, expStartTime,expEndTime); + String expEndTime1 = expEndTime + " 23:59:59"; + List list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList1(account, expStartTime,expEndTime1); ExcelUtil util = new ExcelUtil(BusIntegralHistoryInfo.class); - util.exportExcel(response, list, expEndTime,"帐分历史快照数据"+expEndTime); + util.exportExcel(response, list, expEndTime); } /** diff --git a/ruoyi-ui/src/views/statistics/integral/index.vue b/ruoyi-ui/src/views/statistics/integral/index.vue index ee72bd3..006b943 100644 --- a/ruoyi-ui/src/views/statistics/integral/index.vue +++ b/ruoyi-ui/src/views/statistics/integral/index.vue @@ -289,7 +289,7 @@ export default { handleExport(data) { this.download('business/integral/export', { ...this.queryParams - }, data.storeName+`_${new Date().getTime()}.xlsx`) + }, `账分快照_${new Date().getTime()}.xlsx`) } } };