From dc4f12f66685260ac357997680e5f3fe723c3c4a Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 12 九月 2025 17:22:40 +0800 Subject: [PATCH] 2025.9.12 1. 新增监测设备和巡查场景信息的匹配功能 --- 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