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/Info.kt | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/Info.kt b/src/main/kotlin/cn/flightfeather/supervision/business/Info.kt
index e94f8bc..d0ad1e3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/Info.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/Info.kt
@@ -1,22 +1,26 @@
package cn.flightfeather.supervision.business
import cn.flightfeather.supervision.common.utils.Constant
+import cn.flightfeather.supervision.domain.ds1.entity.Subtask
import java.time.LocalDateTime
-class Info(
+data class Info(
//鍦烘櫙鐢ㄦ埛id
- val userId: String?,
+ val userId: String?,
//椋炵窘鐜涓満鏅搴旂殑鐢ㄦ埛id
- val tzUserId: String?,
+ val tzUserId: String?,
//鍦烘櫙id
- val sceneId: String?,
+ val sceneId: String?,
//鍦烘櫙鍚嶇О
- val sceneName: String?,
- var sceneType: Constant.ScenseType,
- var year: Int,
- val month: Int,
- val period: Int,
- val sTime: LocalDateTime,
- val eTime: LocalDateTime
+ val sceneName: String?,
+ var sceneType: Constant.SceneType,
+ var year: Int? = null,
+ val month: Int? = null,
+ val period: Int? = null,
+ val sTime: LocalDateTime? = null,
+ val eTime: LocalDateTime? = null,
+ val subTask: Subtask? = null,
+ val sceneIndex: Int? = null,
+ val online:Boolean = true
)
\ No newline at end of file
--
Gitblit v1.9.3