liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- createdBy params added for GetTasks

Browse Source
This commit is contained in:
gazebo
2019-03-06 11:15:18 +08:00
parent acfd902071
commit 887eeafa9f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/cms_task.go
View File

@@ -18,6 +18,7 @@ type TaskController struct {
// @Param fromStatus query int false "起始状态"
// @Param toStatus query int false "结束状态"
// @Param lastHours query int false "多少小时以内的"
// @Param createdBy query string false "创建人"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetTasks [get]
@@ -31,7 +32,7 @@ func (c *TaskController) GetTasks() {
} else if params.MapData["toStatus"] == nil {
params.ToStatus = params.FromStatus
}
retVal = tasksch.GetTasks(params.TaskID, params.FromStatus, params.ToStatus, params.LastHours)
retVal = tasksch.GetTasks(params.TaskID, params.FromStatus, params.ToStatus, params.LastHours, params.CreatedBy)
return retVal, "", err
})
}
@@ -45,7 +46,7 @@ func (c *TaskController) GetTasks() {
// @router /CancelTask [put]
func (c *TaskController) CancelTask() {
c.callCancelTask(func(params *tTaskCancelTaskParams) (retVal interface{}, errCode string, err error) {
tasks := tasksch.GetTasks(params.TaskID, tasksch.TaskStatusBegin, tasksch.TaskStatusEnd, 3*24)
tasks := tasksch.GetTasks(params.TaskID, tasksch.TaskStatusBegin, tasksch.TaskStatusEnd, 3*24, "")
if len(tasks) != 1 {
return nil, "", fmt.Errorf("taskID:%s,找不到或找到不仅一个任务", params.TaskID)
}