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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 b69e86b..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
@@ -42,8 +42,8 @@
//获取模板(带公式的模板需要文件编辑之后才会显示正常数据)
InputStream inputStream = ExcelUtil.class.getClassLoader().getResourceAsStream("excel/xlsx/totalTemplateNoFormula.xlsx");
- String time = new SimpleDateFormat("yyyy-MM-dd HH").format(new Date());
- String fileName = time+ "时报汛统计.xlsx";
+ 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();
//设置公式生效
--
Gitblit v1.9.3