From 994a3ef06957ba2a68915531ffae0a2f0dd8939d Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 17 Jul 2024 15:41:09 +0800
Subject: [PATCH] 资料整编导出水库效益、管理体制
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 7c6509c..bcee91f 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
@@ -400,7 +400,7 @@
this.administrativeUnit = attResManagePerson.getUserUnit();
}
- if (attResManagePerson.getType().equals("2")) {
+ if (attResManagePerson.getType().equals("3")) {
//主管
this.competentDepartmentInfo = StringUtil.format("{}({}，{})",
attResManagePerson.getUserName(), attResManagePerson.getPosition(), attResManagePerson.getUserPhone());
@@ -562,10 +562,24 @@
return;
}
- this.protectCity = tbAttResEngBene.getCity().equals("无")?"":tbAttResEngBene.getCity();
+ this.protectCity = tbAttResEngBene.getCity().equals("无")?tbAttResEngBene.getTown():tbAttResEngBene.getCity();
+ if (StringUtil.isBlank(this.protectCity)) {
+ this.protectCity = tbAttResEngBene.getTown().equals("无")?"":tbAttResEngBene.getTown();
+ }
double person = tbAttResEngBene.getFlControlPerson() / 10000.0;
+ if (person > 0) {
+ this.protectPersonLand = String.format("%.2f",person) + "万人口";
+ }
+
+ if (tbAttResEngBene.getFlControlLand() > 0) {
+ if (StringUtil.isBlank(this.protectPersonLand)) {
+ this.protectPersonLand = String.format("%.2f", tbAttResEngBene.getFlControlLand()) + "万亩耕地";
+ } else {
+ this.protectPersonLand = this.protectPersonLand + "、" + String.format("%.2f", tbAttResEngBene.getFlControlLand()) + "万亩耕地";
+ }
+ }
this.protectPersonLand =
StringUtil.format("{}万人口、{}万亩耕地", String.format("%.2f",person) , String.format("%.2f", tbAttResEngBene.getFlControlLand() / 1000));
@@ -637,7 +651,7 @@
String type = SafetyAppraisalTypeEnum.find(tbAttResSafetyMonitor.getSafetyAppraisalResult()).getLabel();
String surveyProblem = tbAttResSafetyMonitor.getSurveyProblem();
//（若一类坝，不介绍问题，二、三类坝介绍）
- if (tbAttResSafetyMonitor.equals("1")) {
+ if (tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("1")) {
this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为\"{}\"。",
time, type);
} else {
@@ -653,7 +667,7 @@
}
this.mUnitName = tbAttResMgrSysB.getMUnitName();
- this.mUnitNature = tbAttResMgrSysB.getMUnitNature().replace("公益类","");
+ this.mUnitNature = tbAttResMgrSysB.getMUnitNature();
this.mUnitPersonNumber = tbAttResMgrSysB.getMUnitPersonNumber().toString();
}
--
Gitblit v1.9.3