From cf119adeab46dcc843c4c7b28a719a0c027d7c88 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 26 Jul 2024 15:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 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 e737e4c..cb0e022 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
@@ -201,7 +201,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());
@@ -327,7 +327,7 @@
String disCharge = isNull(norspi.getCheckingFloodDischarge());
String text = StringUtil.format("溢洪道为{}，{}，堰顶高程{}m，堰顶净宽{}m{}，最大泄洪量{}m³/s。",
- typeName, gateText, StringUtil.format("", String.format("%.2f",norspi.getWeirTopElevation())), WordUtil.removeTrailingZero(weirTopWidth), holeText, WordUtil.removeTrailingZero(disCharge));
+ typeName, gateText, String.format("%.2f",norspi.getWeirTopElevation()), WordUtil.removeTrailingZero(weirTopWidth), holeText, WordUtil.removeTrailingZero(disCharge));
return text;
}
@@ -395,7 +395,7 @@
if (attResManagePerson.getType().equals("1")) {
//行政
- this.administrativeInfo = StringUtil.format("{}({}，{})",
+ this.administrativeInfo = StringUtil.format("{}（{}，{}）",
attResManagePerson.getUserName(), attResManagePerson.getPosition(), attResManagePerson.getUserPhone());
this.administrativeUnit = attResManagePerson.getUserUnit();
@@ -403,7 +403,7 @@
if (attResManagePerson.getType().equals("3")) {
//主管
- this.competentDepartmentInfo = StringUtil.format("{}({}，{})",
+ this.competentDepartmentInfo = StringUtil.format("{}（{}，{}）",
attResManagePerson.getUserName(), attResManagePerson.getPosition(), attResManagePerson.getUserPhone());
}
@@ -518,7 +518,7 @@
hydrologicalCharacteristicsList.add(StringUtil.format("死库容{}万m³", WordUtil.removeTrailingZero(tbAttResStagChar.getDeadCap().toString())));
}
if (tbAttResStagChar.getChecFlStag() != null) {
- hydrologicalCharacteristicsList2.add(StringUtil.format(this.resName + "校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
+ hydrologicalCharacteristicsList2.add(StringUtil.format("校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
}
if (tbAttResStagChar.getDesFlStag() != null) {
hydrologicalCharacteristicsList2.add(StringUtil.format("设计洪水位{}m", String.format("%.2f",tbAttResStagChar.getDesFlStag())));
@@ -541,13 +541,13 @@
TbAttResWaterDelivery tbAttResWaterDelivery = tbAttResWaterDeliveryList.get(0);
if (tbAttResWaterDeliveryList.size() > 1) {
- this.aqueductType = "水库主要采用输水";
+ this.aqueductType = "水库主要采用";
} else {
- this.aqueductType = "水库采用输水";
+ this.aqueductType = "水库采用";
}
- this.aqueductType = this.aqueductType + convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum");
+ this.aqueductType = this.aqueductType + convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum") + "输水";
this.section = isNull(tbAttResWaterDelivery.getSectionWide()) + "×" + isNull(tbAttResWaterDelivery.getSectionHigh());
@@ -572,19 +572,19 @@
double person = tbAttResEngBene.getFlControlPerson() / 10000.0;
if (person > 0) {
- this.protectPersonLand = String.format("%.2f",person) + "万人口";
+ this.protectPersonLand = WordUtil.removeTrailingZero(String.format("%.2f",person)) + "万人口";
}
if (tbAttResEngBene.getFlControlLand() > 0) {
if (StringUtil.isBlank(this.protectPersonLand)) {
- this.protectPersonLand = String.format("%.2f", tbAttResEngBene.getFlControlLand()) + "万亩耕地";
+ this.protectPersonLand = WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getFlControlLand())) + "万亩耕地";
} else {
- this.protectPersonLand = this.protectPersonLand + "、" + String.format("%.2f", tbAttResEngBene.getFlControlLand()) + "万亩耕地";
+ this.protectPersonLand = this.protectPersonLand + "、" + WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getFlControlLand())) + "万亩耕地";
}
}
this.protectPersonLand =
- StringUtil.format("{}万人口、{}万亩耕地", String.format("%.2f",person) , String.format("%.2f", tbAttResEngBene.getFlControlLand() / 1000));
+ StringUtil.format("{}万人口、{}万亩耕地", WordUtil.removeTrailingZero(String.format("%.2f",person)) , WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getFlControlLand() / 1000)));
////铁路、公路、管线、企业几个依次罗列，超过三个列出第二个后为“XX等”，后面不需罗列
String railway = tbAttResEngBene.getRailway();
@@ -623,7 +623,10 @@
if (StringUtils.isNotBlank(tbAttResEngBene.getIrrObject())) {
this.economicBenefit =
StringUtil.format("水库为{}提供灌溉用水，设计灌溉面积{}万亩，有效灌溉面积{}万亩，多年平均灌溉水量{}万m³。",
- tbAttResEngBene.getIrrObject(), String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 10000), String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 10000), tbAttResEngBene.getMoyearIrrAvg());
+ tbAttResEngBene.getIrrObject(),
+ WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 10000)),
+ WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 10000)),
+ WordUtil.removeTrailingZero(tbAttResEngBene.getMoyearIrrAvg().toString()));
}
if (StringUtil.isNotBlank(tbAttResEngBene.getSupplyObject())) {
@@ -654,10 +657,10 @@
String surveyProblem = tbAttResSafetyMonitor.getSurveyProblem();
//（若一类坝，不介绍问题，二、三类坝介绍）
if (tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("1")) {
- this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为\"{}\"。",
+ this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”。",
time, type);
} else {
- this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为\"{}\"，工程主要存在问题为{}",
+ this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”，工程主要存在问题为{}",
time, type, surveyProblem);
}
}
@@ -669,7 +672,7 @@
}
this.mUnitName = tbAttResMgrSysB.getMUnitName();
- this.mUnitNature = tbAttResMgrSysB.getMUnitNature();
+ this.mUnitNature = tbAttResMgrSysB.getMUnitNature().replace("公益类","事业单位");
this.mUnitPersonNumber = tbAttResMgrSysB.getMUnitPersonNumber().toString();
}
--
Gitblit v1.9.3