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`) } } };