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/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