From 65bf414c8946330b65ef6a1310bea6d14f7e6384 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Mon, 12 Aug 2024 15:23:58 +0800
Subject: [PATCH] 资料整编
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 cf21a3b..e9b2e83 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
@@ -226,8 +226,8 @@
tableMap.put("midFloodEnd", mfe);
tableMap.put("afterFloodStart", afs);
tableMap.put("afterFloodEnd", 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?"":String.format("%.2f",tbAttResStagChar.getDesFloodFlowMax()));
+ tableMap.put("checFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getChecFloodFlowMax()==null?"":String.format("%.2f",tbAttResStagChar.getChecFloodFlowMax()));;
String mainDamType = "";
String mainDamMainFoundation = "";
@@ -288,7 +288,7 @@
tableMap.put("mainUpDamProtectType", mainUpDamProtectType);
tableMap.put("mainDownDamProtectType", mainDownDamProtectType);
tableMap.put("damMainBodyType", damMainBodyType);
- tableMap.put("damMainBodyTopElevation", damMainBodyTopElevation);
+ tableMap.put("damMainBodyTopElevation", null !=damMainBodyTopElevation?String.format("%.2f",Double.parseDouble(damMainBodyTopElevation)):"");
tableMap.put("damMainDrainType", damMainDrainType);
tableMap.put("mainDamBodyType", mainDamBodyType);
int subDamNumNew = tbAttResWaterBlockList.size() - 1;
@@ -624,13 +624,13 @@
tableMap.put("protect", String.join("、", protectList));
}
double person = 0;
- if (tbAttResEngBene !=null && tbAttResEngBene.getFlControlPerson() != null) {
+ if (tbAttResEngBene !=null && tbAttResEngBene.getFlControlPerson() != null && tbAttResEngBene.getFlControlPerson() > 0 ) {
person = tbAttResEngBene.getFlControlPerson() / 10000.0;
tableMap.put("flControlPerson", WordUtil.removeTrailingZero(String.format("%.2f", person)));
} else {
tableMap.put("flControlPerson", "");
}
- tableMap.put("flControlLand", tbAttResEngBene==null?"":tbAttResEngBene.getFlControlLand()==null?"":
+ tableMap.put("flControlLand", tbAttResEngBene==null?"":tbAttResEngBene.getFlControlLand()==null || tbAttResEngBene.getFlControlLand() <= 0?"":
WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getFlControlLand() / 10000)));
tableMap.put("irrObject", tbAttResEngBene==null?"":tbAttResEngBene.getIrrObject()==null?"":tbAttResEngBene.getIrrObject());
tableMap.put("moyearIrrAvg", tbAttResEngBene==null?"":tbAttResEngBene.getMoyearIrrAvg() == null?"":
--
Gitblit v1.9.3