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/TaskRep.kt | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt
index 22d0ebb..85bffce 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt
@@ -79,10 +79,13 @@
/**
* 鑾峰彇鏃ヤ换鍔�
* @param taskId 椤跺眰浠诲姟id
+ * @param userId 鎵ц鐢ㄦ埛id
*/
- fun findDayTasks(taskId: String?): List<Task?> {
+ fun findDayTasks(taskId: String?, userId: String? = null): List<Task?> {
return taskMapper.selectByExample(Example(Task::class.java).apply {
- createCriteria().andEqualTo("tsguid", taskId)
+ createCriteria().andEqualTo("tsguid", taskId).apply {
+ userId?.let { andLike("executorguids", "%$it%") }
+ }
orderBy("starttime").desc()
})
}
--
Gitblit v1.9.3