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/executor/BgTaskStatus.kt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTaskStatus.kt b/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTaskStatus.kt index 60bfcf4..93d036a 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTaskStatus.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTaskStatus.kt @@ -1,5 +1,7 @@ package cn.flightfeather.supervision.common.executor +import cn.flightfeather.supervision.socket.LocalDateTimeAdapter +import com.google.gson.annotations.JsonAdapter import java.time.Duration import java.time.LocalDateTime @@ -15,12 +17,15 @@ var status: TaskStatus = TaskStatus.WAITING // 寮�濮嬫椂闂� + @JsonAdapter(LocalDateTimeAdapter::class) var startTime: LocalDateTime? = null // 缁撴潫鏃堕棿 + @JsonAdapter(LocalDateTimeAdapter::class) var endTime: LocalDateTime? = null // 鍒涘缓鏃堕棿 + @JsonAdapter(LocalDateTimeAdapter::class) var createTime: LocalDateTime = LocalDateTime.now() // 杩愯鏃堕暱锛堢锛� -- Gitblit v1.9.3