From 1d46a2bc8a1b843eb2ee84e65fdc2f61651a18a3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 29 Nov 2023 17:55:59 +0800
Subject: [PATCH] 填报word修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 fb57563..c5253db 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
@@ -212,7 +212,7 @@
}
this.subDamInfo = GenerateDamInfo(subDamName, subDam);
- }else{
+ }else if (damCount == 1){
TbAttResWaterBlock mainDam = tbAttResWaterBlockList.get(0);
//第一个就是主坝
this.mainDamInfo = GenerateDamInfo("主坝", mainDam);
@@ -438,13 +438,20 @@
}
//工程等别
- this.engGrad = tbAttResBase.getEngGrad();
+ if (tbAttResBase.getEngGrad() != null){
+ this.engGrad = tbAttResBase.getEngGrad();
+ }
- //开工时间 (2022年9月)
- this.startTime = new SimpleDateFormat("yyyy年MM月").format(tbAttResBase.getStartTime());
+ if (tbAttResBase.getStartTime() != null){
+ //开工时间 (2022年9月)
+ this.startTime = new SimpleDateFormat("yyyy年MM月").format(tbAttResBase.getStartTime());
+ }
- //蓄水时间(2022年9月)
- this.waterStorageTm = new SimpleDateFormat("yyyy年MM月").format(tbAttResBase.getWaterStorageTm());
+ if (tbAttResBase.getWaterStorageTm() != null){
+ //蓄水时间(2022年9月)
+ this.waterStorageTm = new SimpleDateFormat("yyyy年MM月").format(tbAttResBase.getWaterStorageTm());
+ }
+
}
private void formatTbAttResStagChar(TbAttResStagChar tbAttResStagChar) {
@@ -525,8 +532,12 @@
}
this.protectCity = tbAttResEngBene.getCity();
+
+ double person = tbAttResEngBene.getFlControlPerson() / 1000.0;
+
+
this.protectPersonLand =
- StringUtil.format("{}万人口、{}万亩耕地", String.format("%.2f",tbAttResEngBene.getFlControlPerson()/1000) , String.format("%.2f", tbAttResEngBene.getFlControlLand() / 1000));
+ StringUtil.format("{}万人口、{}万亩耕地", String.format("%.2f",person) , String.format("%.2f", tbAttResEngBene.getFlControlLand() / 1000));
////铁路、公路、管线、企业几个依次罗列，超过三个列出第二个后为“XX等”，后面不需罗列
String railway = tbAttResEngBene.getRailway();
@@ -588,8 +599,10 @@
if (tbAttResSafetyMonitor ==null){
return;
}
-
- String time = new SimpleDateFormat("yyyy年MM月").format(tbAttResSafetyMonitor.getSafetyAppraisalTime());
+ String time = "";
+ if (tbAttResSafetyMonitor.getSafetyAppraisalTime() != null){
+ time = new SimpleDateFormat("yyyy年MM月").format(tbAttResSafetyMonitor.getSafetyAppraisalTime());
+ }
String type = SafetyAppraisalTypeEnum.find(tbAttResSafetyMonitor.getSafetyAppraisalResult()).getLabel();
String surveyProblem = tbAttResSafetyMonitor.getSurveyProblem();
//（若一类坝，不介绍问题，二、三类坝介绍）
--
Gitblit v1.9.3