From 9b65b461bafa7368796a7b02fd8c0bf5794675a6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 八月 2023 17:27:19 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/service/XlsExportService.java |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/yssh/service/XlsExportService.java b/src/main/java/com/yssh/service/XlsExportService.java
index b538306..a496d90 100644
--- a/src/main/java/com/yssh/service/XlsExportService.java
+++ b/src/main/java/com/yssh/service/XlsExportService.java
@@ -61,24 +61,30 @@
     }
 
     /**
+     * 鍒涘缓Excel
+     */
+    private <T> void 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);
+    }
+
+    /**
      * 鍒涘缓鏃ユ姤
      */
     public void createDayReport(Date date) {
         try {
             Date yesterday = DateUtils.getAPeriodOfTime(date, -1, Calendar.DATE);
 
-            String type = "day";
             List<DayExcel> list = new ArrayList<>();
             for (int i = 1; i < 47; i++) {
                 DayExcel day = new DayExcel("AI-" + (i < 10 ? "0" : "") + i, "lj", "ljtb", "ys", "3m/s", "涓滃崡", "掳c");
                 list.add(day);
             }
 
-            String source = getXslTemplate(type);
-            String strData = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, yesterday);
-            String target = String.format("%s\\%s.xlsx", getExpPath(type), strData);
-
-            createExcel(source, target, list);
+            createExcel("day", yesterday, list);
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }
@@ -92,18 +98,13 @@
             Date start = DateUtils.getAPeriodOfTime(date, -7, Calendar.DATE);
             Date end = DateUtils.getAPeriodOfTime(date, -1, Calendar.DATE);
 
-            String type = "week";
             List<WeekExcel> list = new ArrayList<>();
             for (int i = 1; i < 47; i++) {
                 WeekExcel day = new WeekExcel("AI-" + (i < 10 ? "0" : "") + i, "zhb", "ztq", "ztb", "zhb2", "lj", "ljtb", "syn", "ys", "fs", "fx", "掳c");
                 list.add(day);
             }
 
-            String source = getXslTemplate(type);
-            String strData = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, end);
-            String target = String.format("%s\\%s.xlsx", getExpPath(type), strData);
-
-            createExcel(source, target, list);
+            createExcel("week", end, list);
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }
@@ -118,19 +119,13 @@
             Date start = DateUtils.getMonthStart(yesterday);
             Date end = DateUtils.getMonthEnd(yesterday);
 
-
-            String type = "month";
             List<MonthExcel> list = new ArrayList<>();
             for (int i = 1; i < 47; i++) {
                 MonthExcel day = new MonthExcel("AI-" + (i < 10 ? "0" : "") + i, "yhb", "ytq", "ytb", "yhb2", "lj", "ljtb", "qyn", "ys", "fs", "fx", "掳c");
                 list.add(day);
             }
 
-            String source = getXslTemplate(type);
-            String strData = DateUtils.parseDateToStr(DateUtils.YYYYMM, end);
-            String target = String.format("%s\\%s.xlsx", getExpPath(type), strData);
-
-            createExcel(source, target, list);
+            createExcel("month", end, list);
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }

--
Gitblit v1.9.3