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/service/impl/SjztmdServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 71a95e9..ebaa605 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
@@ -203,7 +203,7 @@
tableMap.put("totalCap", tbAttResStagChar==null || tbAttResStagChar.getTotalCap()==null?"":WordUtil.removeTrailingZero(tbAttResStagChar.getTotalCap().toString()));
tableMap.put("desFlStag", tbAttResStagChar==null || tbAttResStagChar.getDesFlStag()==null?"":tbAttResStagChar.getDesFlStag());
tableMap.put("flprCap", tbAttResStagChar==null || tbAttResStagChar.getFlprCap()==null?"":WordUtil.removeTrailingZero(tbAttResStagChar.getFlprCap().toString()));
- tableMap.put("flConTopStag", tbAttResStagChar==null || tbAttResStagChar.getFlConTopStag()==null?"":tbAttResStagChar.getFlConTopStag());
+ tableMap.put("flConTopStag", tbAttResStagChar==null || tbAttResStagChar.getFlConTopStag()==null?"":String.format("%.2f",tbAttResStagChar.getFlConTopStag()));
tableMap.put("flSortCap", tbAttResStagChar==null || tbAttResStagChar.getFlStorCap()==null?"":tbAttResStagChar.getFlStorCap());
tableMap.put("corNormStag", tbAttResStagChar==null || tbAttResStagChar.getCorNormStag()==null?"":String.format("%.2f",tbAttResStagChar.getCorNormStag()));
tableMap.put("adjustStorCap", tbAttResStagChar==null || tbAttResStagChar.getAdjustStorCap()==null?"":WordUtil.removeTrailingZero(tbAttResStagChar.getAdjustStorCap().toString()));
@@ -236,8 +236,8 @@
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());;
+ tableMap.put("desFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getDesFloodFlowMax()==null?"":WordUtil.removeTrailingZero(tbAttResStagChar.getDesFloodFlowMax().toString()));
+ tableMap.put("checFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getChecFloodFlowMax()==null?"":WordUtil.removeTrailingZero(tbAttResStagChar.getChecFloodFlowMax().toString()));;
String mainDamType = "";
String mainDamMainFoundation = "";
@@ -363,9 +363,9 @@
}
if (null != tbAttResRsbNorspi.getGateWide()) {
if (StringUtil.isNotBlank(typeName)) {
- norwgtStr += "，" + tbAttResRsbNorspi.getGateWide() + "×" + tbAttResRsbNorspi.getGateLength();
+ norwgtStr += "，" + tbAttResRsbNorspi.getGateNum() + "-" + tbAttResRsbNorspi.getGateWide() + "×" + tbAttResRsbNorspi.getGateLength();
} else {
- norwgtStr += tbAttResRsbNorspi.getGateWide() + "×" + tbAttResRsbNorspi.getGateLength();
+ norwgtStr += tbAttResRsbNorspi.getGateNum() + "-" + tbAttResRsbNorspi.getGateWide() + "×" + tbAttResRsbNorspi.getGateLength();
}
}
// norWorkingGateType = StringUtil.format("{},{}X{}", typeName, tbAttResRsbNorspi.getGateWide(), tbAttResRsbNorspi.getGateLength());
@@ -390,12 +390,12 @@
if (StringUtil.isNotBlank(tbAttResRsbNorspi.getOcPower())) {
list.add(tbAttResRsbNorspi.getOcPower());
}
- norOc = String.join(",", list);
+ norOc = String.join("，", list);
}
tableMap.put("norSpillwayType", norSpillwayType);
tableMap.put("isLocDamBody", isLocDamBody);
- tableMap.put("norWeirTopElevation", norWeirTopElevation);
+ tableMap.put("norWeirTopElevation", StringUtils.isEmpty(norWeirTopElevation)?norWeirTopElevation:String.format("%.2f", Double.parseDouble(norWeirTopElevation)));
tableMap.put("norWeirTopWidth", norWeirTopWidth);
tableMap.put("norWorkingGateType", norWorkingGateType);
tableMap.put("norCheckingFloodDischarge", norCheckingFloodDischarge);
@@ -455,13 +455,13 @@
List<String> list = new ArrayList<>();
list.add(convertType(tbAttResRsbSpillway.getOcType(), "OcTypeEnum"));
list.add(tbAttResRsbSpillway.getOcPower());
- rsbOc = String.join(",", list);
+ rsbOc = String.join("，", list);
}
tableMap.put("rsbSpillwayType", rsbSpillwayType);
tableMap.put("coveLength", coveLength);
- tableMap.put("rsbThresholdElevation", rsbThresholdElevation);
+ tableMap.put("rsbThresholdElevation", StringUtils.isEmpty(rsbThresholdElevation)?rsbThresholdElevation:String.format("%.2f",Double.parseDouble(rsbThresholdElevation)));
tableMap.put("rsbExportElevation", rsbExportElevation);
tableMap.put("rsbSection", rsbSection);
tableMap.put("checkFlDisCharge", checkFlDisCharge);
@@ -499,13 +499,13 @@
List<String> list = new ArrayList<>();
list.add(convertType(tbAttResWaterDelivery.getOcType(), "SpillwayHoleType"));
list.add(convertType(tbAttResWaterDelivery.getOcPower(), "SpillwayHoleType"));
- deliverOc = String.join(",", list);
+ deliverOc = String.join("，", list);
if (i == 0) {
tableMap.put("输水建筑物名称1", StringUtil.isBlank(tbAttResWaterDelivery.getName())?"输水建筑物":tbAttResWaterDelivery.getName());
tableMap.put("aqueductType1", aqueductType);
tableMap.put("aqueductLength1", aqueductLength);
- tableMap.put("thresholdElevation1", thresholdElevation);
+ tableMap.put("thresholdElevation1", StringUtils.isEmpty(thresholdElevation)?thresholdElevation:String.format("%.2f",Double.parseDouble(thresholdElevation)));
tableMap.put("exportElevation1", exportElevation);
tableMap.put("deliverSection1", deliverSection);
tableMap.put("designFlow1", designFlow);
@@ -516,7 +516,7 @@
tableMap.put("输水建筑物名称2", StringUtil.isBlank(tbAttResWaterDelivery.getName())?"输水建筑物":tbAttResWaterDelivery.getName());
tableMap.put("aqueductType2", aqueductType);
tableMap.put("aqueductLength2", aqueductLength);
- tableMap.put("thresholdElevation2", thresholdElevation);
+ tableMap.put("thresholdElevation2", StringUtils.isEmpty(thresholdElevation)?thresholdElevation:String.format("%.2f",Double.parseDouble(thresholdElevation)));
tableMap.put("exportElevation2", exportElevation);
tableMap.put("deliverSection2", deliverSection);
tableMap.put("designFlow2", designFlow);
@@ -527,7 +527,7 @@
tableMap.put("输水建筑物名称3", StringUtil.isBlank(tbAttResWaterDelivery.getName())?"输水建筑物":tbAttResWaterDelivery.getName());
tableMap.put("aqueductType3", aqueductType);
tableMap.put("aqueductLength3", aqueductLength);
- tableMap.put("thresholdElevation3", thresholdElevation);
+ tableMap.put("thresholdElevation3", StringUtils.isEmpty(thresholdElevation)?thresholdElevation:String.format("%.2f",Double.parseDouble(thresholdElevation)));
tableMap.put("exportElevation3", exportElevation);
tableMap.put("deliverSection3", deliverSection);
tableMap.put("designFlow3", designFlow);
--
Gitblit v1.9.3