From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 17 十二月 2024 11:41:00 +0800
Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象

---
 src/main/kotlin/cn/flightfeather/supervision/common/utils/DateUtil.kt |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/utils/DateUtil.kt b/src/main/kotlin/cn/flightfeather/supervision/common/utils/DateUtil.kt
index 455e29f..811545a 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/utils/DateUtil.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/utils/DateUtil.kt
@@ -1,11 +1,12 @@
 package cn.flightfeather.supervision.common.utils
 
+import org.springframework.stereotype.Component
 import java.sql.Timestamp
 import java.text.ParsePosition
 import java.text.SimpleDateFormat
 import java.util.*
 
-class DateUtil {
+object DateUtil {
     private val threadLocal = ThreadLocal<SimpleDateFormat>()
 
     private val `object` = Any()
@@ -271,7 +272,7 @@
      * @return 鏃ユ湡瀛楃涓�
      */
     fun DateToString(date: Date?, pattern: String): String? {
-        var dateString: String? = null
+        var dateString: String? = ""
         if (date != null) {
             try {
                 dateString = getDateFormat(pattern).format(date)

--
Gitblit v1.9.3