From 0bdd1bda41e6fa8436d070b1f4e5b1f19f86d9d8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 27 Feb 2024 14:34:46 +0800
Subject: [PATCH] Merge branch 'jtdev' into 20240222-patrol
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 bb91bd2..6c7ca14 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
@@ -2,6 +2,7 @@
+import cn.gistack.sm.sjztmd.util.MyDateUtils;
import cn.gistack.sm.sjztmd.word.service.ISjztmdService;
import cn.gistack.sm.sjztmd.word.util.ExcelUtil;
import cn.gistack.sm.sjztmd.word.util.WordUtil;
@@ -73,8 +74,28 @@
List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
List<SzInfo> szInfoList = sjztmdService.getSzInfo(isShow);
- byte[] data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList);
+ HashMap<String,String> over10Params = new HashMap<>();
+ //small_start_stag=0&small_end_stag=2&mid_start_stag=0&mid_end_stag=2&big_start_stag=0&big_end_stag=2
+ over10Params.put("small_start_stag", "10");
+ over10Params.put("mid_start_stag", "10");
+ over10Params.put("big_start_stag", "10");
+ HashMap<String,String> normalParams = new HashMap<>();
+ //small_start_stag=0&small_end_stag=2&mid_start_stag=0&mid_end_stag=2&big_start_stag=0&big_end_stag=2
+ normalParams.put("small_start_stag", "0");
+ normalParams.put("mid_start_stag", "0");
+ normalParams.put("big_start_stag", "0");
+
+
+ List<TotalInfo> totalOverList = sjztmdService.getTotalOverInfo(isShow,normalParams);
+ List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow,over10Params);
+ byte[] data = null;
+ if (MyDateUtils.isTodayInFloodSeason()){
+ data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList);
+ }else {
+ data= WordUtil.GetNotInSeasonOverInfo(totalList,dzkList,overDetailList,szInfoList,totalOverList,totalOver10List);
+
+ }
// 创建响应实体并设置响应头，将输出流作为响应体返回给客户端
InputStreamResource resource = new InputStreamResource(new ByteArrayInputStream(data));
--
Gitblit v1.9.3