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/domain/ds1/repository/EvaluationRep.kt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRep.kt
index c3ccd05..daa3233 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRep.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRep.kt
@@ -24,14 +24,14 @@
* @param date 鏃ユ湡锛屽彧浣跨敤骞村拰鏈�
* @return
*/
- fun findByScene(sceneId: String?, date: LocalDate): Evaluation? {
+ fun findByScene(sceneId: String?, date: LocalDate): List<Evaluation?> {
val sT = date.withDayOfMonth(1).atStartOfDay()
val eT = sT.plusMonths(1).minusSeconds(1)
val res = evaluationMapper.selectByExample(Example(Evaluation::class.java).apply {
createCriteria().andEqualTo("sguid", sceneId)
.andBetween("evaluatetime", sT, eT)
})
- return if (res.isNotEmpty()) res[0] else null
+ return res
}
fun findBySubtask(subTaskId: String?): Evaluation? {
--
Gitblit v1.9.3