diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml index 01fa3ce73a..f966c662bb 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml @@ -264,6 +264,7 @@ schedule.enable, schedule.create_user AS createUserName, schedule.create_time, + QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id, project.name as projectName, @@ -286,6 +287,7 @@ schedule.enable, schedule.create_user AS createUserName, schedule.create_time, + QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id, project.name as projectName, @@ -308,6 +310,7 @@ schedule.enable, schedule.create_user AS createUserName, schedule.create_time, + QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id, project.name as projectName, @@ -330,6 +333,7 @@ schedule.enable, schedule.create_user AS createUserName, schedule.create_time, + QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id, project.name as projectName, @@ -353,6 +357,7 @@ schedule.enable, schedule.create_user AS createUserId, schedule.create_time, + QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS nextTime, project.organization_id, project.name as projectName, diff --git a/frontend/src/views/taskCenter/component/systemTaskTable.vue b/frontend/src/views/taskCenter/component/systemTaskTable.vue index 1350b799b7..a4e7423781 100644 --- a/frontend/src/views/taskCenter/component/systemTaskTable.vue +++ b/frontend/src/views/taskCenter/component/systemTaskTable.vue @@ -235,7 +235,7 @@ }, { title: 'ms.taskCenter.lastFinishTime', - dataIndex: 'lastFinishTime', + dataIndex: 'lastTime', width: 170, sortable: { sortDirections: ['ascend', 'descend'], @@ -367,7 +367,7 @@ ...item, runRuleLoading: false, createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') : '-', - lastFinishTime: item.lastFinishTime ? dayjs(item.lastFinishTime).format('YYYY-MM-DD HH:mm:ss') : '-', + lastTime: item.lastTime && item.lastTime !== -1 ? dayjs(item.lastTime).format('YYYY-MM-DD HH:mm:ss') : '-', nextTime: item.nextTime ? dayjs(item.nextTime).format('YYYY-MM-DD HH:mm:ss') : '-', }; }