From e347a1d5026d01df98a52dd1c9cdb757ae221459 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 16 Aug 2024 21:14:10 +0800
Subject: [PATCH] 资料整编
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 6 +++---
1 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 1c01edd..bc389dc 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
@@ -311,8 +311,8 @@
* 设X孔（溢洪道闸门数量，有闸控制写，无闸不写，1孔“设X孔”改为“单孔”），最大泄洪量XXm³/s。
*/
-// String typeName = SpillwayTypeEnum.find(norspi.getSpillwayType()).getLabel();
- String typeName = norspi.getName();
+ String typeName = SpillwayTypeEnum.find(norspi.getSpillwayType()).getLabel();
+// String typeName = norspi.getName();
if (StringUtil.isBlank(typeName) && norspi.getSpillwayType().indexOf(",") > -1) {
String [] tmpSt = norspi.getSpillwayType().split(",");
if (tmpSt[0].equals("9")) {
@@ -680,7 +680,7 @@
if (tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("1")) {
this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”。",
time, type).replaceAll("。。","。");
- } else {
+ } else if (tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("2") || tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("3")) {
this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”，工程主要存在问题为{}。",
time, type, surveyProblem).replaceAll("。。","。");
}
--
Gitblit v1.9.3