Skip to content

Commit a72697a

Browse files
authored
fix: [Trigger] Add scheduled task next execution time (#4761)
1 parent e0b967d commit a72697a

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

apps/trigger/sql/get_trigger_page_list.sql

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
1+
WITH scheduler AS (SELECT SPLIT_PART(id, ':', 2) as trigger_id,
2+
id,
3+
next_run_time
4+
FROM django_apscheduler_djangojob
5+
WHERE id LIKE 'trigger:%')
26
SELECT *
37
FROM (SELECT t.id,
48
t.workspace_id,
@@ -12,6 +16,10 @@ FROM (SELECT t.id,
1216
t.update_time,
1317
t.user_id,
1418
(SELECT nick_name FROM "user" WHERE id = t.user_id) AS create_user,
19+
COALESCE(
20+
(ARRAY_AGG(sj.next_run_time ORDER BY sj.next_run_time))[1],
21+
NULL
22+
) as next_run_time,
1523
COALESCE(
1624
JSON_AGG(
1725
JSON_BUILD_OBJECT(
@@ -23,6 +31,7 @@ FROM (SELECT t.id,
2331
) AS trigger_task,
2432
STRING_AGG(COALESCE(app.name, tool.name), ' ') AS trigger_task_str
2533
FROM event_trigger t
34+
LEFT JOIN scheduler sj ON sj.trigger_id=t.id::text
2635
LEFT JOIN event_trigger_task tt ON t.id = tt.trigger_id
2736
LEFT JOIN application app ON tt.source_type = 'APPLICATION' AND tt.source_id = app.id
2837
LEFT JOIN tool ON tt.source_type = 'TOOL' AND tt.source_id = tool.id

0 commit comments

Comments
 (0)