From 2121dd0a19e0f944d926230036d93e0a4cedfc99 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Tue, 3 Feb 2026 14:38:00 +0800 Subject: [PATCH] fix: [Trigger] Add scheduled task next execution time --- apps/trigger/sql/get_trigger_page_list.sql | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/trigger/sql/get_trigger_page_list.sql b/apps/trigger/sql/get_trigger_page_list.sql index 370ce3a5d6f..59e944e9fc5 100644 --- a/apps/trigger/sql/get_trigger_page_list.sql +++ b/apps/trigger/sql/get_trigger_page_list.sql @@ -1,4 +1,8 @@ - +WITH scheduler AS (SELECT SPLIT_PART(id, ':', 2) as trigger_id, + id, + next_run_time + FROM django_apscheduler_djangojob + WHERE id LIKE 'trigger:%') SELECT * FROM (SELECT t.id, t.workspace_id, @@ -12,6 +16,10 @@ FROM (SELECT t.id, t.update_time, t.user_id, (SELECT nick_name FROM "user" WHERE id = t.user_id) AS create_user, + COALESCE( + (ARRAY_AGG(sj.next_run_time ORDER BY sj.next_run_time))[1], + NULL + ) as next_run_time, COALESCE( JSON_AGG( JSON_BUILD_OBJECT( @@ -23,6 +31,7 @@ FROM (SELECT t.id, ) AS trigger_task, STRING_AGG(COALESCE(app.name, tool.name), ' ') AS trigger_task_str FROM event_trigger t + LEFT JOIN scheduler sj ON sj.trigger_id=t.id::text LEFT JOIN event_trigger_task tt ON t.id = tt.trigger_id LEFT JOIN application app ON tt.source_type = 'APPLICATION' AND tt.source_id = app.id LEFT JOIN tool ON tt.source_type = 'TOOL' AND tt.source_id = tool.id