From 92f0cae9d6744dea6cd036b1e668cc8c5a5696c7 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Mon, 12 Aug 2024 16:43:18 +0800
Subject: [PATCH] 资料整编
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/SafetyAppraisalTypeEnum.java | 3 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java | 14 ++++++++++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 22 ++++++++++++++--------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx | 0
4 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/SafetyAppraisalTypeEnum.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/SafetyAppraisalTypeEnum.java
index 82e90c6..3e9537f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/SafetyAppraisalTypeEnum.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/SafetyAppraisalTypeEnum.java
@@ -24,10 +24,13 @@
*/
FIRST("1","一类坝"),
+ FIRST2("一类坝","一类坝"),
SECOND("2","二类坝"),
+ SECOND2("二类坝","二类坝"),
THIRD("3","三类坝"),
+ THIRD2("三类坝","三类坝"),
NULL_ABLE("","");
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
index e9b2e83..5171bae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
@@ -14,6 +14,7 @@
import cn.gistack.sm.sjztmd.word.vo.*;
import cn.gistack.sm.sjztods.constant.ZtApiUrlConstant;
import cn.gistack.sm.sjztods.constant.ZtConfigConstant;
+import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -222,12 +223,21 @@
String afe = tbAttResStagChar==null?"":tbAttResStagChar.getAfterFloodEnd() != null ? new SimpleDateFormat("M月dd日").format(tbAttResStagChar.getAfterFloodEnd()) : "";
tableMap.put("beforeFloodStart", bfs);
tableMap.put("beforeFloodEnd", bfe);
+ if (!StringUtils.isEmpty(bfs) && !StringUtils.isEmpty(bfe)) {
+ tableMap.put("beforeFloodDataInfo", bfs + "-" + bfe);
+ }
tableMap.put("midFloodStart", mfs);
tableMap.put("midFloodEnd", mfe);
+ if (!StringUtils.isEmpty(mfs) && !StringUtils.isEmpty(mfe)) {
+ tableMap.put("midFloodDataInfo", mfs + "-" + mfe);
+ }
tableMap.put("afterFloodStart", afs);
tableMap.put("afterFloodEnd", afe);
- tableMap.put("desFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getDesFloodFlowMax()==null?"":String.format("%.2f",tbAttResStagChar.getDesFloodFlowMax()));
- tableMap.put("checFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getChecFloodFlowMax()==null?"":String.format("%.2f",tbAttResStagChar.getChecFloodFlowMax()));;
+ if (!StringUtils.isEmpty(afs) && !StringUtils.isEmpty(afe)) {
+ tableMap.put("afterFloodDataInfo", afs + "-" + afe);
+ }
+ tableMap.put("desFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getDesFloodFlowMax()==null?"":tbAttResStagChar.getDesFloodFlowMax());
+ tableMap.put("checFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getChecFloodFlowMax()==null?"":tbAttResStagChar.getChecFloodFlowMax());;
String mainDamType = "";
String mainDamMainFoundation = "";
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 05277fa..e734a12 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
@@ -207,7 +207,7 @@
//大坝数量
int damCount = tbAttResWaterBlockList.size();
if (damCount > 1) {
- buildingList.add(StringUtil.format("副坝({}座)", damCount - 1));
+ buildingList.add(StringUtil.format("副坝（{}座）", damCount - 1));
//根据名字判断主坝
List<TbAttResWaterBlock> mainDamList = tbAttResWaterBlockList.stream().filter(tbAttResWaterBlock -> tbAttResWaterBlock.getName().indexOf("主坝") > -1).collect(Collectors.toList());
@@ -248,10 +248,15 @@
//输水建筑物
if (tbAttResWaterDeliveryList.size()>0&&tbAttResWaterDeliveryList.get(0).getNum() != null && tbAttResWaterDeliveryList.get(0).getNum() > 0) {
- tbAttResWaterDeliveryList.forEach(tbAttResWaterDelivery -> {
-// buildingList.add( convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum"));
+// tbAttResWaterDeliveryList.forEach(tbAttResWaterDelivery -> {
+//// buildingList.add( convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum"));
+// buildingList.add("输水建筑物");
+// });
+ if (tbAttResWaterDeliveryList.size() > 1) {
+ buildingList.add(StringUtil.format("输水建筑物（{}座）",tbAttResWaterDeliveryList.size()));
+ } else {
buildingList.add("输水建筑物");
- });
+ }
}
//电站
@@ -306,7 +311,8 @@
* 设X孔（溢洪道闸门数量，有闸控制写，无闸不写，1孔“设X孔”改为“单孔”），最大泄洪量XXm³/s。
*/
- String typeName = SpillwayTypeEnum.find(norspi.getSpillwayType()).getLabel();
+// 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")) {
@@ -624,9 +630,9 @@
//超过三个列出第二个后为“XX等”，后面不需罗列
if (protectList.size() > 3) {
List<String> sublist = protectList.subList(0, 2);
- this.protectThings = String.join("；", sublist) + "等";
+ this.protectThings = String.join("、", sublist) + "等";
} else {
- this.protectThings = String.join("；", protectList);
+ this.protectThings = String.join("、", protectList);
}
this.economicBenefit = "";
@@ -675,7 +681,7 @@
this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”。",
time, type);
} else {
- this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”，工程主要存在问题为{}",
+ this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”，工程主要存在问题为{}。",
time, type, surveyProblem);
}
}
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 767c501..6eb9c15 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