From e039f5e9a3063eeec2c6c51f83e08beda0d1b5ca Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 09 Dec 2023 17:42:22 +0800
Subject: [PATCH] 填报word表格
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 c5253db..c7b9315 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
@@ -182,9 +182,9 @@
//正常溢洪道
List<TbAttResRsbNorspi> tbAttResRsbNorspiList = (List<TbAttResRsbNorspi>) resRsbNorsipiVerspiMionitorDetailByGuid.get("tbAttResRsbNorspiList");
- //泄洪洞
- List<TbAttResRsbVerspi> tbAttResRsbVerspiList = (List<TbAttResRsbVerspi>) resRsbNorsipiVerspiMionitorDetailByGuid.get("tbAttResRsbVerspiList");
//非常溢洪道
+ List<TbAttResRsbVerspi> tbAttResRsbVerspiList = (List<TbAttResRsbVerspi>) resRsbNorsipiVerspiMionitorDetailByGuid.get("tbAttResRsbVerspiList");
+ //泄洪洞
List<TbAttResRsbSpillway> tbAttResRsbSpillwayList = (List<TbAttResRsbSpillway>) resRsbNorsipiVerspiMionitorDetailByGuid.get("tbAttResRsbSpillwayList");
@@ -533,7 +533,7 @@
this.protectCity = tbAttResEngBene.getCity();
- double person = tbAttResEngBene.getFlControlPerson() / 1000.0;
+ double person = tbAttResEngBene.getFlControlPerson() / 10000.0;
this.protectPersonLand =
@@ -547,19 +547,19 @@
List<String> protectList = new ArrayList<>();
- if (StringUtil.isNotBlank(railway)) {
+ if (StringUtil.isNotBlank(railway) && !railway.equals("无")) {
protectList.add(railway);
}
- if (StringUtil.isNotBlank(highway)) {
+ if (StringUtil.isNotBlank(highway)&& !highway.equals("无")) {
protectList.add(highway);
}
- if (StringUtil.isNotBlank(importCommunication)) {
+ if (StringUtil.isNotBlank(importCommunication)&& !importCommunication.equals("无")) {
protectList.add(importCommunication);
}
- if (StringUtil.isNotBlank(importFactory)) {
+ if (StringUtil.isNotBlank(importFactory)&& !importFactory.equals("无")) {
protectList.add(importFactory);
}
this.protectThings = "";
@@ -576,19 +576,19 @@
if (StringUtils.isNotBlank(tbAttResEngBene.getIrrObject())) {
this.economicBenefit =
StringUtil.format("水库为{}提供灌溉用水，设计灌溉面积{}万亩，有效灌溉面积{}万亩，多年平均灌溉水量{}万m³。",
- tbAttResEngBene.getIrrObject(), String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 1000), String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 1000), tbAttResEngBene.getMoyearIrrAvg());
+ tbAttResEngBene.getIrrObject(), String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 10000), String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 10000), tbAttResEngBene.getMoyearIrrAvg());
}
if (StringUtil.isNotBlank(tbAttResEngBene.getSupplyObject())) {
if (StringUtils.isNotBlank(this.economicBenefit)) {
this.economicBenefit = this.economicBenefit +
StringUtil.format("此外，水库为{}{}万人提供生活用水，年均供水量{}万m³。",
- tbAttResEngBene.getSupplyObject(),String.format("%.2f", Double.parseDouble(tbAttResEngBene.getSupplyPopulation())/ 1000), tbAttResEngBene.getMoyearSupplyAvg());
+ tbAttResEngBene.getSupplyObject(),String.format("%.2f", Double.parseDouble(tbAttResEngBene.getSupplyPopulation())/ 10000), tbAttResEngBene.getMoyearSupplyAvg());
} else {
//无灌溉有供水直接介绍供水
this.economicBenefit =
StringUtil.format("水库为{}{}万人提供生活用水，年均供水量{}万m³。",
- tbAttResEngBene.getSupplyObject(),String.format("%.2f", Double.parseDouble(tbAttResEngBene.getSupplyPopulation())/ 1000), tbAttResEngBene.getMoyearSupplyAvg());
+ tbAttResEngBene.getSupplyObject(),String.format("%.2f", Double.parseDouble(tbAttResEngBene.getSupplyPopulation())/ 10000), tbAttResEngBene.getMoyearSupplyAvg());
}
}
@@ -638,7 +638,7 @@
}
//key值表示其他
- if (typeKey.equals("9") || Integer.parseInt(typeKey) == 9 || typeKey.equals("其他")) {
+ if (typeKey.equals("9") || typeKey.equals("其他") || Integer.parseInt(typeKey) == 9 ) {
text = explain;
}else{
switch (enumName) {
--
Gitblit v1.9.3