From 86910cd63c9f188065999552cd49f7ac14464fbb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 08 Jul 2024 11:33:53 +0800
Subject: [PATCH] 每日报汛增加堰顶
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 a1cdfe1..f40fe2e 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
@@ -281,6 +281,7 @@
String flse_lim_stag = "";
String control_z = "";
String wat_shed_area = "";
+ String weir_top_elevation = "";
if (null != szInfo.getFlse_lim_stag())
flse_lim_stag = String.valueOf(szInfo.getFlse_lim_stag());
@@ -288,6 +289,8 @@
control_z = String.valueOf(szInfo.getControl_z());
if (null != szInfo.getWat_shed_area())
wat_shed_area = String.valueOf(szInfo.getWat_shed_area());
+ if (null != szInfo.getWeir_top_elevation())
+ weir_top_elevation = String.valueOf(szInfo.getWeir_top_elevation());
// 之前临时处理逻辑 --2024-06-20去除--
// switch (resNm) {
@@ -319,6 +322,12 @@
// }
List<String> detailList = new ArrayList<>();
+ if (StringUtil.isNotBlank(weir_top_elevation)) {
+ detailList.add(StringUtil.format("堰顶高程{}米", weir_top_elevation));
+ }
+ if (StringUtil.isNotBlank(flse_lim_stag)) {
+ detailList.add(StringUtil.format("汛限水位{}米", flse_lim_stag));
+ }
if (StringUtil.isNotBlank(flse_lim_stag)) {
detailList.add(StringUtil.format("汛限水位{}米", flse_lim_stag));
}
@@ -389,6 +398,9 @@
if (ObjectUtil.isNotEmpty(dzkInfo.getTb_flse_lim_stag())) {
detailList.add(StringUtil.format("汛限水位{}米", dzkInfo.getTb_flse_lim_stag()));
}
+ if (ObjectUtil.isNotEmpty(dzkInfo.getTb_weir_top_elevation())) {
+ detailList.add(StringUtil.format("堰顶高程{}米", dzkInfo.getTb_weir_top_elevation()));
+ }
String detail = String.join("，", detailList);
text = StringUtil.format(" {}{}{}（{}）。", dzkInfo.getP_ad_name(), dzkInfo.getAd_name(), dzkInfo.getRes_name(), detail);
--
Gitblit v1.9.3