From 63ad9f50c8d46a9a22ee1f6e5fed908087ca0489 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 28 Feb 2024 09:11:26 +0800
Subject: [PATCH] Merge branch 'jtdev' into 20240222-patrol
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 ec5ff96..4224db9 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
@@ -121,8 +121,13 @@
this.hour,total,big,mid,small,dangerCountTotal,overDangerCountTotal);
String totalOverNormal10Value = getOverNormal10(totalOver10List);
+ String smallValue = "";
+ if (smallList.size()>0){
+ smallValue = String.join("、",smallList);
+ }else {
+ smallValue = "没有超正常的小型水库";
+ }
- String smallValue = String.join("、",smallList);
String bigValue="";
if (bigList.size()>0){
bigValue=
--
Gitblit v1.9.3