From 39081183f7cc171aefc435f33b077d3ce41fd2ea Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Sat, 17 Aug 2024 13:11:01 +0800
Subject: [PATCH] 资料整编
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
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 ebaa605..270652e 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
@@ -298,7 +298,7 @@
tableMap.put("mainUpDamProtectType", mainUpDamProtectType);
tableMap.put("mainDownDamProtectType", mainDownDamProtectType);
tableMap.put("damMainBodyType", damMainBodyType);
- tableMap.put("damMainBodyTopElevation", null !=damMainBodyTopElevation?String.format("%.2f",Double.parseDouble(damMainBodyTopElevation)):"");
+ tableMap.put("damMainBodyTopElevation", StringUtil.isNotBlank(damMainBodyTopElevation)?String.format("%.2f",Double.parseDouble(damMainBodyTopElevation)):"");
tableMap.put("damMainDrainType", damMainDrainType);
tableMap.put("mainDamBodyType", mainDamBodyType);
int subDamNumNew = tbAttResWaterBlockList.size() - 1;
@@ -343,7 +343,13 @@
TbAttResRsbNorspi tbAttResRsbNorspi = tbAttResRsbNorspiList.get(0);
if (tbAttResRsbNorspi.getSpillwayType().indexOf("9") > -1) {
- norSpillwayType = tbAttResRsbNorspi.getSpillwayType().split(",")[1];
+ String [] spillwayTypeStrs = tbAttResRsbNorspi.getSpillwayType().split(",");
+ if (spillwayTypeStrs.length > 1) {
+ norSpillwayType = spillwayTypeStrs[1];
+ } else {
+ norSpillwayType = SpillwayTypeEnum.find(tbAttResRsbNorspi.getSpillwayType()).getLabel();
+ }
+
} else {
norSpillwayType = SpillwayTypeEnum.find(tbAttResRsbNorspi.getSpillwayType()).getLabel();
}
@@ -352,9 +358,9 @@
norWeirTopElevation = isNullObject(tbAttResRsbNorspi.getWeirTopElevation());
norWeirTopWidth = isNullObject(tbAttResRsbNorspi.getWeirTopWidth());
- if (tbAttResRsbNorspi.getIsGate().equals("否")) {
+ if (null != tbAttResRsbNorspi.getIsGate() && tbAttResRsbNorspi.getIsGate().equals("否")) {
norWorkingGateType = "无闸控制";
- } else if (tbAttResRsbNorspi.getIsGate().equals("是")) {
+ } else if (null != tbAttResRsbNorspi.getIsGate() && tbAttResRsbNorspi.getIsGate().equals("是")) {
// 平板闸门，3X3
String typeName = RsbWorkingGateEnum.find(tbAttResRsbNorspi.getWorkingGateType().toString()).getLabel();
String norwgtStr = "";
@@ -455,7 +461,11 @@
List<String> list = new ArrayList<>();
list.add(convertType(tbAttResRsbSpillway.getOcType(), "OcTypeEnum"));
list.add(tbAttResRsbSpillway.getOcPower());
- rsbOc = String.join("，", list);
+ if (StringUtil.isNotBlank(convertType(tbAttResRsbSpillway.getOcType(), "OcTypeEnum")) &&
+ StringUtil.isNotBlank(tbAttResRsbSpillway.getOcPower())) {
+ rsbOc = String.join("，", list);
+ }
+
}
@@ -532,7 +542,7 @@
tableMap.put("deliverSection3", deliverSection);
tableMap.put("designFlow3", designFlow);
tableMap.put("workingGateType3", workingGateType);
- tableMap.put("deliverOc", deliverOc);
+ tableMap.put("deliverOc3", deliverOc);
}
}
@@ -669,7 +679,7 @@
// }
- tableMap.put("supplyPopulation", tbAttResEngBene.getSupplyPopulation());
+ tableMap.put("supplyPopulation", tbAttResEngBene==null?"":tbAttResEngBene.getSupplyPopulation()==null?"":tbAttResEngBene.getSupplyPopulation());
tableMap.put("moyearSupplyAvg", tbAttResEngBene==null?"":tbAttResEngBene.getMoyearSupplyAvg()==null?"":tbAttResEngBene.getMoyearSupplyAvg());
tableMap.put("moyearPowerAvg", tbAttResEngBene==null?"":tbAttResEngBene.getMoyearPowerAvg()==null?"":tbAttResEngBene.getMoyearPowerAvg());
tableMap.put("ecologicalFlow", tbAttResEngBene==null?"":tbAttResEngBene.getEcologicalFlow()==null?"":tbAttResEngBene.getEcologicalFlow());
@@ -1249,6 +1259,10 @@
private String convertType(String type, String enumName) {
+ if (StringUtil.isBlank(type)) {
+ return "";
+ }
+
String text = "";
List<String> typeList = Arrays.asList(type.split(","));
--
Gitblit v1.9.3