Merge branch 'dev-czl' into dev

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:"-"` // 执行耗时

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