From 177189bf68d9af3e46d9716717115d3ada862106 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sun, 10 Dec 2023 20:07:51 +0800
Subject: [PATCH] 资料整编导出优化
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 6b7fa8e..c6e063a 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
@@ -155,14 +155,14 @@
tableMap.put("basName", BasCodeEnum.find(tbAttResBase.getBasCode()).getLabel());
tableMap.put("locRvName", tbAttResBase.getLocRvName());
- String st = tbAttResBase.getStartTime() != null ? new SimpleDateFormat("M月dd日").format(tbAttResBase.getStartTime()) : "";
- String wst = tbAttResBase.getWaterStorageTm() != null ? new SimpleDateFormat("M月dd日").format(tbAttResBase.getWaterStorageTm()) : "";
+ String st = tbAttResBase.getStartTime() != null ? new SimpleDateFormat("YYYY年M月dd日").format(tbAttResBase.getStartTime()) : "";
+ String wst = tbAttResBase.getWaterStorageTm() != null ? new SimpleDateFormat("YYYY年M月dd日").format(tbAttResBase.getWaterStorageTm()) : "";
tableMap.put("startTime", st);
tableMap.put("waterStorageTm", wst);
- tableMap.put("reinforceTm", tbAttResSafetyMonitor.getReinforceTm());
- tableMap.put("completionTime", tbAttResSafetyMonitor.getCompletionTime());
+ tableMap.put("reinforceTm", tbAttResSafetyMonitor.getReinforceTm() != null? new SimpleDateFormat("YYYY年M月dd日").format(tbAttResSafetyMonitor.getReinforceTm()) : "");
+ tableMap.put("completionTime", tbAttResSafetyMonitor.getCompletionTime() != null? new SimpleDateFormat("YYYY年M月dd日").format(tbAttResSafetyMonitor.getCompletionTime()) : "");
String resFunc = tbAttResBase.getResFunc();
if (StringUtil.isNotBlank(resFunc)) {
--
Gitblit v1.9.3