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/controller/DownTemplateController.java | 6 +++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/ExcelUtil.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
index dd05808..2753007 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
@@ -74,8 +74,8 @@
@GetMapping("/download/overFloodInfo")
public ResponseEntity overFloodInfo(String isShow) throws Exception{
- String time = new SimpleDateFormat("yyyy-MM-dd HH").format(new Date());
- String fileName = time+ "时报汛文件.docx";
+ String time = new SimpleDateFormat("yyyy日MM月dd日HH时").format(new Date());
+ String fileName = time+ "报汛文件.docx";
String fileNameURL = URLEncoder.encode(fileName, "UTF-8");
//获取总览、大中库、明细数据
List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
@@ -111,7 +111,7 @@
// 将临时文件添加到响应中，以便用户下载
return ResponseEntity.ok()
.contentType(MediaType.valueOf("application/vnd.openxmlformats-officedocument.wordprocessingml.document")) // 设置响应的内容类型为二进制流（octet stream）
- .header("Content-Disposition", "attachment; filename=\"" + fileNameURL) // 设置响应的Content-Disposition头，以便浏览器提示用户下载文件
+ .header("Content-Disposition", "attachment; filename=" + fileNameURL) // 设置响应的Content-Disposition头，以便浏览器提示用户下载文件
.body(resource); // 将InputStreamResource对象作为响应体
}
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