From 534bafc2f1c6c000a6394b973f4ce566105afd18 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Tue, 30 Jul 2024 15:48:35 +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 | 5 ++---
1 files changed, 2 insertions(+), 3 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 0c4acc0..2f28444 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
@@ -91,7 +91,7 @@
@GetMapping("/download/overFloodInfo")
public ResponseEntity overFloodInfo(String isShow) throws Exception {
- String time = new SimpleDateFormat("yyyy日MM月dd日HH时").format(new Date());
+ String time = new SimpleDateFormat("yyyy年MM月dd日HH时").format(new Date());
String fileName = time + "报汛文件.docx";
String fileNameURL = URLEncoder.encode(fileName, "UTF-8");
//获取总览、大中库、明细数据
@@ -140,8 +140,7 @@
List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow, over10Params);
//昨日报汛内容
- QueryWrapper queryWrapper = new QueryWrapper();
- YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(queryWrapper);
+ YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(oneDayBefore.format(formatter2));
byte[] data = null;
if (MyDateUtils.isTodayInFloodSeason()) {
--
Gitblit v1.9.3