From 9de7f6c737a6370888564add8cc0e2be9f196329 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 20 May 2024 13:55:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/ExcelUtil.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/ExcelUtil.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/ExcelUtil.java
index 6f3d73b..94402a8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/ExcelUtil.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/ExcelUtil.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.word.util;
import ch.qos.logback.core.pattern.FormatInfo;
+import cn.gistack.sm.sjztmd.vo.StationExport;
import cn.gistack.sm.sjztmd.word.vo.DzkInfo;
import cn.gistack.sm.sjztmd.word.vo.OverDetail;
import cn.gistack.sm.sjztmd.word.vo.TotalInfo;
@@ -41,7 +42,9 @@
//获取模板(带公式的模板需要文件编辑之后才会显示正常数据)
InputStream inputStream = ExcelUtil.class.getClassLoader().getResourceAsStream("excel/xlsx/totalTemplateNoFormula.xlsx");
- String fileName = StringUtil.format("水库超汛限水位情况计表（{}）.xlsx",tm);
+ String time = new SimpleDateFormat("yyyy日MM月dd日HH时").format(new Date());
+ String fileName = time+ "报汛统计.xlsx";
+// String fileName = StringUtil.format("水库超汛限水位情况计表（{}）.xlsx",tm);
ExcelWriter excelWriter = EasyExcel.write(getOutputStream(fileName, response)).withTemplate(inputStream).excelType(ExcelTypeEnum.XLSX).build();
//设置公式生效
// excelWriter.writeContext().writeWorkbookHolder().getWorkbook().setForceFormulaRecalculation(true);
@@ -201,4 +204,19 @@
}
}
+ public static void createStationExcel(HttpServletResponse response,String title, String fileName, List<StationExport> list ,String templatePath) throws Exception {
+
+ HashMap<String,String> map = new HashMap<>();
+ map.put("title",title);
+
+ InputStream inputStream = ExcelUtil.class.getClassLoader().getResourceAsStream(templatePath);
+ ExcelWriter excelWriter = EasyExcel.write(getOutputStream(fileName, response)).withTemplate(inputStream).excelType(ExcelTypeEnum.XLSX).build();
+ WriteSheet writeSheet1 = EasyExcel.writerSheet().build();
+
+ // 这个传进去的 map 就是非表格数据，
+ excelWriter.fill(map, writeSheet1);
+ excelWriter.fill(new FillWrapper("data", list), writeSheet1);
+
+ excelWriter.finish();
+ }
}
--
Gitblit v1.9.3