From 7aa20fb0dae74b316130ebf20b0b72cd3b76def4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 八月 2023 17:42:21 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/entity/xls/XlsReport.java     |    9 +++++++++
 src/main/java/com/yssh/service/XlsExportService.java |   10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yssh/entity/xls/XlsReport.java b/src/main/java/com/yssh/entity/xls/XlsReport.java
new file mode 100644
index 0000000..5132074
--- /dev/null
+++ b/src/main/java/com/yssh/entity/xls/XlsReport.java
@@ -0,0 +1,9 @@
+package com.yssh.entity.xls;
+
+/**
+ * Excel鎶ュ憡瀹炰綋绫�
+ * @author WWW
+ * @date 2023-08-09
+ */
+public class XlsReport {
+}
diff --git a/src/main/java/com/yssh/service/XlsExportService.java b/src/main/java/com/yssh/service/XlsExportService.java
index a496d90..de45864 100644
--- a/src/main/java/com/yssh/service/XlsExportService.java
+++ b/src/main/java/com/yssh/service/XlsExportService.java
@@ -63,12 +63,14 @@
     /**
      * 鍒涘缓Excel
      */
-    private <T> void createExcel(String type, Date date, List<T> list) throws Exception {
+    private <T> String createExcel(String type, Date date, List<T> list) throws Exception {
         String source = getXslTemplate(type);
         String strData = DateUtils.parseDateToStr("month".equals(type) ? DateUtils.YYYYMM : DateUtils.YYYYMMDD, date);
         String target = String.format("%s\\%s.xlsx", getExpPath(type), strData);
 
         createExcel(source, target, list);
+
+        return String.format("%s\\%s.xlsx", type, strData);
     }
 
     /**
@@ -84,7 +86,7 @@
                 list.add(day);
             }
 
-            createExcel("day", yesterday, list);
+           String filePath = createExcel("day", yesterday, list);
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }
@@ -104,7 +106,7 @@
                 list.add(day);
             }
 
-            createExcel("week", end, list);
+            String filePath = createExcel("week", end, list);
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }
@@ -125,7 +127,7 @@
                 list.add(day);
             }
 
-            createExcel("month", end, list);
+            String filePath = createExcel("month", end, list);
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }

--
Gitblit v1.9.3