From da7826f004a742840cbbd693570cab318530164d Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 4 Sep 2021 10:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87excl=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=87=BA=E7=8E=B0=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/utils/util/BussStandExportUtil.java    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
index 0e8f8207..aadd47a0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
@@ -9,6 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -105,10 +106,14 @@ public class BussStandExportUtil {
                 value = sarStandardsInfoEO.getStandStatusShow();
                 break;
             case "标准实施日期":
-                if (sarStandardsInfoEO.getPutTime() != null) {
-                    String issueTime = sdf.format(sarStandardsInfoEO.getPutTime());
-                    value = issueTime;
+                String putTime="";
+                if (Date.class.equals(sarStandardsInfoEO.getPutTime())) {
+                    putTime = sdf.format(sarStandardsInfoEO.getPutTime());
+
+                }else {
+                    putTime=sarStandardsInfoEO.getPutTime();
                 }
+                value = putTime;
                 break;
             case "代替企标编号":
                 value = sarStandardsInfoEO.getReplaceStandNum();
@@ -117,10 +122,13 @@ public class BussStandExportUtil {
                 value = sarStandardsInfoEO.getReplacedStandNum();
                 break;
             case "发布日期":
-                if (sarStandardsInfoEO.getIssueTime() != null) {
-                    String issueTime = sdf.format(sarStandardsInfoEO.getIssueTime());
-                    value = issueTime;
+                String issueTime="";
+                if (Date.class.equals(sarStandardsInfoEO.getIssueTime().getClass())){
+                     issueTime = sdf.format(sarStandardsInfoEO.getIssueTime());
+                }else {
+                    issueTime=sarStandardsInfoEO.getIssueTime();
                 }
+                value = issueTime;
                 break;
             case "复审日期":
                 String field1 = attrInfoMap.get(name);