From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +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/WordUtil.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
index c209699..04ab44a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
@@ -4,6 +4,7 @@
import cn.gistack.sm.sjztmd.word.vo.*;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.data.NumbericRenderData;
+import org.springblade.core.tool.utils.StringUtil;
import java.io.*;
import java.util.ArrayList;
@@ -124,6 +125,8 @@
params.put("时间", overWord.getTm());
params.put("全省水库超汛限", overWord.getTotalInfo());
params.put("小型水库详情", overWord.getOverSmallInfo());
+ String dxStr = StringUtil.isNotBlank(overWord.getOverBigInfo()) ? "超汛限的水库的大型水库有：" : "";
+ params.put("超汛限的水库的大型水库有", dxStr);
params.put("大型水库详情", overWord.getOverBigInfo());
params.put("中型水库详情", overWord.getOverMidInfo());
params.put("省直水库详情", overWord.getProvinceInfo());
--
Gitblit v1.9.3