From a80ae0ce5bd06a42ece41e6a448b00991a0076e8 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 15 Aug 2024 21:40:55 +0800
Subject: [PATCH] 资料整编
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 6 +++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx | 0
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
index e734a12..1c01edd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
@@ -530,7 +530,7 @@
hydrologicalCharacteristicsList.add(StringUtil.format("死库容{}万m³", WordUtil.removeTrailingZero(tbAttResStagChar.getDeadCap().toString())));
}
if (tbAttResStagChar.getChecFlStag() != null) {
- hydrologicalCharacteristicsList2.add(StringUtil.format("校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
+ hydrologicalCharacteristicsList2.add(StringUtil.format("水库校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
}
if (tbAttResStagChar.getDesFlStag() != null) {
hydrologicalCharacteristicsList2.add(StringUtil.format("设计洪水位{}m", String.format("%.2f",tbAttResStagChar.getDesFlStag())));
@@ -679,10 +679,10 @@
//（若一类坝，不介绍问题，二、三类坝介绍）
if (tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("1")) {
this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”。",
- time, type);
+ time, type).replaceAll("。。","。");
} else {
this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”，工程主要存在问题为{}。",
- time, type, surveyProblem);
+ time, type, surveyProblem).replaceAll("。。","。");
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx
index 6eb9c15..d04eb60 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx
Binary files differ
--
Gitblit v1.9.3