From 7cbe1610b87da19ed8a146a09b1117f92d9d3d98 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 19 九月 2025 17:30:37 +0800
Subject: [PATCH] 2025.9.19 1. 联合前端调试数据产品接口(待完成)
---
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt | 25 +++++++++++++++++++++++--
1 files changed, 23 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..5b6a53a 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,11 +79,32 @@
/**
* 鑾峰彇鏃ヤ换鍔�
* @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()
})
}
+
+ /**
+ * 鑾峰彇鐩稿悓鍖哄煙鍐呬笂涓懆鏈熺殑鎬讳换鍔�
+ */
+ fun findLastTopTask(taskId: String?): Task? {
+ val task = taskMapper.selectByPrimaryKey(taskId) ?: return null
+
+ return taskMapper.selectByExample(Example(Task::class.java).apply {
+ createCriteria()
+ .andNotEqualTo("tguid", task.tguid)
+ .andEqualTo("typeno", task.typeno)
+ .andEqualTo("levelnum", 2)
+ .andEqualTo("provincecode", task.provincecode)
+ .andEqualTo("citycode", task.citycode)
+ .andEqualTo("districtcode", task.districtcode)
+ orderBy("starttime").desc()
+ }).firstOrNull()
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3