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/business/datafetch/FetchNightConstruction.kt | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/datafetch/FetchNightConstruction.kt b/src/main/kotlin/cn/flightfeather/supervision/business/datafetch/FetchNightConstruction.kt
index 85b4cc8..4f0ed9f 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/datafetch/FetchNightConstruction.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/datafetch/FetchNightConstruction.kt
@@ -43,8 +43,6 @@
@Autowired
lateinit var userinfoMapper: UserinfoMapper
- private val dateUtil = DateUtil()
-
@PostConstruct
fun init() {
instance = this
@@ -65,7 +63,7 @@
val timeStr = if (it.isNotEmpty()) {
val cal = Calendar.getInstance().apply { time = it[0]?.ncCreateTime }
cal.add(Calendar.DAY_OF_MONTH, -1)
- dateUtil.DateToString(cal.time, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS) ?: DEFAULT_TIME
+ DateUtil.DateToString(cal.time, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS) ?: DEFAULT_TIME
} else {
DEFAULT_TIME
}
@@ -83,10 +81,10 @@
ncConstructionUnit = vo["constructionUnit"].asString
ncPerson = vo["person"].asString
ncApplyContent = vo["applyContent"].asString
- ncStartDate = dateUtil.StringToDate(vo["startDate"].asString)
- ncEndDate = dateUtil.StringToDate(vo["endDate"].asString)
+ ncStartDate = DateUtil.StringToDate(vo["startDate"].asString)
+ ncEndDate = DateUtil.StringToDate(vo["endDate"].asString)
ncFileName = vo["filename"].asString
- ncCreateTime = dateUtil.StringToDate(vo["createtime"].asString)
+ ncCreateTime = DateUtil.StringToDate(vo["createtime"].asString)
ncUrl = vo["url"].asString
ncProvinceCode = PROVINCE_CODE
--
Gitblit v1.9.3