From 03019e863755d767ffedc09bc4f84aebd4352a23 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 23 Feb 2024 09:18:41 +0800
Subject: [PATCH] 水库报汛word导出修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 21b1ad7..a73216e 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
@@ -48,7 +48,8 @@
list.add(text);
}
- this.provinceInfo = String.join("\n\r\r\r\r",list);
+// this.provinceInfo = String.join("\n\r\r\r\r",list);
+ this.provinceInfo = String.join("\n",list);
}
private String generateSzInfo(SzInfo szInfo){
@@ -112,7 +113,7 @@
}
String detail = StringUtil.join(detailList,"，");
- text = StringUtil.format("{}{}水位{}米，{}库水位{}米，（{}{}米，{}）。",
+ text = StringUtil.format(" {}{}水位{}米，{}库水位{}米，（{}{}米，{}）。",
resNm,oldTm,oldRz,newTm,newRz,upOrDown,diffRz,detail);
return text;
@@ -141,8 +142,11 @@
midListInfo.add(generateDzkInfo(dzkInfo));
}
- this.overBigInfo = String.join("\n\r\r\r\r",bigListInfo);
- this.overMidInfo = String.join("\n\r\r\r\r",midListInfo);
+// this.overBigInfo = String.join("\n\r\r\r\r",bigListInfo);
+// this.overMidInfo = String.join("\n\r\r\r\r",midListInfo);
+
+ this.overBigInfo = String.join("\n",bigListInfo);
+ this.overMidInfo = String.join("\n",midListInfo);
}
private String generateDzkInfo(DzkInfo dzkInfo){
@@ -169,7 +173,7 @@
}
String detail = String.join("，",detailList);
- text = StringUtil.format("{}{}{}（{}）。",dzkInfo.getP_ad_name(),dzkInfo.getAd_name(),dzkInfo.getRes_name(),detail);
+ text = StringUtil.format(" {}{}{}（{}）。",dzkInfo.getP_ad_name(),dzkInfo.getAd_name(),dzkInfo.getRes_name(),detail);
return text;
}
--
Gitblit v1.9.3