feiyu02
2025-09-19 7cbe1610b87da19ed8a146a09b1117f92d9d3d98
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()
    }
}