From 92f0cae9d6744dea6cd036b1e668cc8c5a5696c7 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Mon, 12 Aug 2024 16:43:18 +0800
Subject: [PATCH] 资料整编
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 e9b2e83..5171bae 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
@@ -14,6 +14,7 @@
import cn.gistack.sm.sjztmd.word.vo.*;
import cn.gistack.sm.sjztods.constant.ZtApiUrlConstant;
import cn.gistack.sm.sjztods.constant.ZtConfigConstant;
+import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -222,12 +223,21 @@
String afe = tbAttResStagChar==null?"":tbAttResStagChar.getAfterFloodEnd() != null ? new SimpleDateFormat("M月dd日").format(tbAttResStagChar.getAfterFloodEnd()) : "";
tableMap.put("beforeFloodStart", bfs);
tableMap.put("beforeFloodEnd", bfe);
+ if (!StringUtils.isEmpty(bfs) && !StringUtils.isEmpty(bfe)) {
+ tableMap.put("beforeFloodDataInfo", bfs + "-" + bfe);
+ }
tableMap.put("midFloodStart", mfs);
tableMap.put("midFloodEnd", mfe);
+ if (!StringUtils.isEmpty(mfs) && !StringUtils.isEmpty(mfe)) {
+ tableMap.put("midFloodDataInfo", mfs + "-" + mfe);
+ }
tableMap.put("afterFloodStart", afs);
tableMap.put("afterFloodEnd", afe);
- 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()));;
+ if (!StringUtils.isEmpty(afs) && !StringUtils.isEmpty(afe)) {
+ tableMap.put("afterFloodDataInfo", afs + "-" + afe);
+ }
+ tableMap.put("desFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getDesFloodFlowMax()==null?"":tbAttResStagChar.getDesFloodFlowMax());
+ tableMap.put("checFloodFlowMax", tbAttResStagChar==null || tbAttResStagChar.getChecFloodFlowMax()==null?"":tbAttResStagChar.getChecFloodFlowMax());;
String mainDamType = "";
String mainDamMainFoundation = "";
--
Gitblit v1.9.3