test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(任务中心): 未展示上次完成时间&&排序有误 

--bug=1047993 --user=宋昌昌 【任务中心】系统后台任务列表-定时任务开启且执行完成-未展示上次完成时间 https://www.tapd.cn/55049933/s/1598986
This commit is contained in:
song-cc-rock 2024-10-28 11:17:33 +08:00 committed by Craftsman
parent d85d7f9595
commit bdc539a4a1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml
View File

@ -264,6 +264,7 @@
schedule.enable, schedule.enable,
schedule.create_user AS createUserName, schedule.create_user AS createUserName,
schedule.create_time, schedule.create_time,
QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time,
QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time,
project.organization_id, project.organization_id,
project.name as projectName, project.name as projectName,
@ -286,6 +287,7 @@
schedule.enable, schedule.enable,
schedule.create_user AS createUserName, schedule.create_user AS createUserName,
schedule.create_time, schedule.create_time,
QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time,
QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time,
project.organization_id, project.organization_id,
project.name as projectName, project.name as projectName,
@ -308,6 +310,7 @@
schedule.enable, schedule.enable,
schedule.create_user AS createUserName, schedule.create_user AS createUserName,
schedule.create_time, schedule.create_time,
QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time,
QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time,
project.organization_id, project.organization_id,
project.name as projectName, project.name as projectName,
@ -330,6 +333,7 @@
schedule.enable, schedule.enable,
schedule.create_user AS createUserName, schedule.create_user AS createUserName,
schedule.create_time, schedule.create_time,
QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time,
QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time,
project.organization_id, project.organization_id,
project.name as projectName, project.name as projectName,
@ -353,6 +357,7 @@
schedule.enable, schedule.enable,
schedule.create_user AS createUserId, schedule.create_user AS createUserId,
schedule.create_time, schedule.create_time,
QRTZ_TRIGGERS.PREV_FIRE_TIME AS last_time,
QRTZ_TRIGGERS.NEXT_FIRE_TIME AS nextTime, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS nextTime,
project.organization_id, project.organization_id,
project.name as projectName, project.name as projectName,

4
frontend/src/views/taskCenter/component/systemTaskTable.vue
View File

@ -235,7 +235,7 @@
}, },
{ {
title: 'ms.taskCenter.lastFinishTime', title: 'ms.taskCenter.lastFinishTime',
dataIndex: 'lastFinishTime', dataIndex: 'lastTime',
width: 170, width: 170,
sortable: { sortable: {
sortDirections: ['ascend', 'descend'], sortDirections: ['ascend', 'descend'],
@ -367,7 +367,7 @@
...item, ...item,
runRuleLoading: false, runRuleLoading: false,
createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') : '-', 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') : '-', nextTime: item.nextTime ? dayjs(item.nextTime).format('YYYY-MM-DD HH:mm:ss') : '-',
}; };
} }