From d83da738d4b534f2ffc4c055b8bb27a9574ad27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BE=99?= Date: Mon, 10 Jul 2023 16:14:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8E=86=E5=8F=B2=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bean/vo/response/task_history.go | 2 ++ src/service/task_history.go | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bean/vo/response/task_history.go b/src/bean/vo/response/task_history.go index 5606d6b..87bc00e 100644 --- a/src/bean/vo/response/task_history.go +++ b/src/bean/vo/response/task_history.go @@ -25,6 +25,8 @@ type TaskInfoListRes struct { type TaskExecLogRes struct { Id int `json:"id"` // 主键id + ExecDesc string `json:"exec_desc"` // 执行说明 + TaskName string `json:"task_name"` // 任务名称 ExecStartTime time.Time `json:"exec_start_time" ` // 执行开始时间 ExecEndTime time.Time `json:"exec_end_time"` // 执行结束时间 ExecTime int `json:"exec_time" xorm:"-"` // 执行耗时 diff --git a/src/service/task_history.go b/src/service/task_history.go index 1aebfda..a47a9ab 100644 --- a/src/service/task_history.go +++ b/src/service/task_history.go @@ -122,7 +122,9 @@ func (t *TaskHistorySvc) TaskExecLog(id int) (taskExecLogRes response.TaskExecLo } //查询 - _, err = db.Table("task_history").Where("id = ?", id).Get(&taskExecLogRes) + _, err = db.Table("task_history").Alias("th").Where("id = ?", id). + Select("th.id,th.exec_desc,(select tm.task_name from task_manage tm where th.task_id = tm.id and tm.is_delete = 0) as task_name," + + "th.exec_start_time,th.exec_end_time,th.state,th.exec_log").Get(&taskExecLogRes) if err != nil { err = resp.DbSelectError.WithError(err) return -- 2.26.0