From 4db89f09402a812828589c486875f6dc94574f88 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 八月 2023 11:30:01 +0800
Subject: [PATCH] 1
---
src/main/resources/templates/month.xlsx | 0
src/main/java/com/yssh/entity/xls/WeekExcel.java | 15 +++++++++++++++
src/main/java/com/yssh/config/InitConfig.java | 4 +++-
src/main/resources/templates/week.xlsx | 0
src/main/java/com/yssh/entity/xls/MonthExcel.java | 15 +++++++++++++++
src/main/java/com/yssh/service/XlsExportService.java | 26 +++++++++++++++++++++++---
6 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/yssh/config/InitConfig.java b/src/main/java/com/yssh/config/InitConfig.java
index 6bacd13..ccd4a32 100644
--- a/src/main/java/com/yssh/config/InitConfig.java
+++ b/src/main/java/com/yssh/config/InitConfig.java
@@ -47,7 +47,9 @@
// 璇诲彇dat鏁版嵁
commonService.readDatData();
- xlsService.createDayReport();
+ // xlsService.createDayReport();
+ // xlsService.createWeekReport();
+ // xlsService.createMonthReport();
//test();
logger.info("***************** 绯荤粺鍚姩瀹屾瘯 *****************" + "\n");
diff --git a/src/main/java/com/yssh/entity/xls/MonthExcel.java b/src/main/java/com/yssh/entity/xls/MonthExcel.java
index 1b2de1f..8ed3075 100644
--- a/src/main/java/com/yssh/entity/xls/MonthExcel.java
+++ b/src/main/java/com/yssh/entity/xls/MonthExcel.java
@@ -69,6 +69,21 @@
public MonthExcel() {
}
+ public MonthExcel(String sy, String yhb, String ytq, String ytb, String yhb2, String lj, String ljtb, String qyn, String ys, String fs, String fx, String wd) {
+ this.sy = sy;
+ this.yhb = yhb;
+ this.ytq = ytq;
+ this.ytb = ytb;
+ this.yhb2 = yhb2;
+ this.lj = lj;
+ this.ljtb = ljtb;
+ this.qyn = qyn;
+ this.ys = ys;
+ this.fs = fs;
+ this.fx = fx;
+ this.wd = wd;
+ }
+
public String getSy() {
return sy;
}
diff --git a/src/main/java/com/yssh/entity/xls/WeekExcel.java b/src/main/java/com/yssh/entity/xls/WeekExcel.java
index 7d8f400..9135633 100644
--- a/src/main/java/com/yssh/entity/xls/WeekExcel.java
+++ b/src/main/java/com/yssh/entity/xls/WeekExcel.java
@@ -69,6 +69,21 @@
public WeekExcel() {
}
+ public WeekExcel(String sz, String zhb, String ztq, String ztb, String zhb2, String lj, String ljtb, String syn, String ys, String fs, String fx, String wd) {
+ this.sz = sz;
+ this.zhb = zhb;
+ this.ztq = ztq;
+ this.ztb = ztb;
+ this.zhb2 = zhb2;
+ this.lj = lj;
+ this.ljtb = ljtb;
+ this.syn = syn;
+ this.ys = ys;
+ this.fs = fs;
+ this.fx = fx;
+ this.wd = wd;
+ }
+
public String getSz() {
return sz;
}
diff --git a/src/main/java/com/yssh/service/XlsExportService.java b/src/main/java/com/yssh/service/XlsExportService.java
index dc788a8..e8964c7 100644
--- a/src/main/java/com/yssh/service/XlsExportService.java
+++ b/src/main/java/com/yssh/service/XlsExportService.java
@@ -1,6 +1,8 @@
package com.yssh.service;
import com.yssh.entity.xls.DayExcel;
+import com.yssh.entity.xls.MonthExcel;
+import com.yssh.entity.xls.WeekExcel;
import com.yssh.utils.ExcelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +75,7 @@
}
String source = getXslTemplate(type);
- String target = String.format("%s\\%d.xlsx", getExpPath(type), 20230808);
+ String target = String.format("%s\\%d.xlsx", getExpPath(type), 20230809);
createExcel(source, target, list);
} catch (Exception ex) {
@@ -86,8 +88,17 @@
*/
public void createWeekReport() {
try {
- String source = getXslTemplate("week");
+ 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", "wd");
+ list.add(day);
+ }
+ String source = getXslTemplate(type);
+ String target = String.format("%s\\%d.xlsx", getExpPath(type), 20230807);
+
+ createExcel(source, target, list);
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
@@ -98,8 +109,17 @@
*/
public void createMonthReport() {
try {
- String source = getXslTemplate("month");
+ 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", "wd");
+ list.add(day);
+ }
+ String source = getXslTemplate(type);
+ String target = String.format("%s\\%d.xlsx", getExpPath(type), 202308);
+
+ createExcel(source, target, list);
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
diff --git a/src/main/resources/templates/month.xlsx b/src/main/resources/templates/month.xlsx
index 7529646..699a0d1 100644
--- a/src/main/resources/templates/month.xlsx
+++ b/src/main/resources/templates/month.xlsx
Binary files differ
diff --git a/src/main/resources/templates/week.xlsx b/src/main/resources/templates/week.xlsx
index 5d61b7a..01f86ee 100644
--- a/src/main/resources/templates/week.xlsx
+++ b/src/main/resources/templates/week.xlsx
Binary files differ
--
Gitblit v1.9.3