From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:13:35 +0800
Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑

---
 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