From 086a63de1dbccc0b49a1eead4c871f1a3572762e Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 17 May 2024 14:53:31 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 190fc43..dd05808 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").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);
--
Gitblit v1.9.3