From ca111dfdc1e0b46d6316a168cd1bfa197171eddd Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 20 Jun 2024 19:08:14 +0800
Subject: [PATCH] 每日报讯重点水库

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
index f0c14f3..cb215fe 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
@@ -45,6 +45,7 @@
 	private String overNormalMidInfo;
 
 	private String smsResultInfo;
+	private String zdInfo;
 
 	public OverWord(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList, List<SzInfo> szInfoList, List<SmsResultVO> resultVOList, List<CallTaskResultVO> whtjList, String isNew) {
 		this.tm = new SimpleDateFormat("MM月dd日H时").format(new Date());
@@ -234,14 +235,22 @@
 	private void formatSzInfo(List<SzInfo> szInfoList) {
 		List<String> list = new ArrayList<>();
 
+		List<String> listZd = new ArrayList<>();
+
 		for (int i = 0; i < szInfoList.size(); i++) {
 			SzInfo szInfo = szInfoList.get(i);
-			String text = generateSzInfo(szInfo);
-			list.add(text);
+			if (szInfo.getType().equals("省直水库")) {
+				String text = generateSzInfo(szInfo);
+				list.add(text);
+			} else {
+				listZd.add(generateSzInfo(szInfo));
+			}
+
 		}
 
 //		this.provinceInfo = String.join("\n\r\r\r\r",list);
 		this.provinceInfo = String.join("\n", list);
+		this.zdInfo = String.join("\n", listZd);
 	}
 
 	private String generateSzInfo(SzInfo szInfo) {

--
Gitblit v1.9.3