From 887eeafa9f1ebfd3b759766518a7b13e58027d9f Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 6 Mar 2019 11:15:18 +0800
Subject: [PATCH] - createdBy params added for GetTasks

---
 business/jxutils/tasksch/task_man.go | 8 ++++----
 controllers/cms_task.go              | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/business/jxutils/tasksch/task_man.go b/business/jxutils/tasksch/task_man.go
index 37def71b1..68088628e 100644
--- a/business/jxutils/tasksch/task_man.go
+++ b/business/jxutils/tasksch/task_man.go
@@ -20,7 +20,7 @@ func init() {
 	defTaskMan.taskList = make(map[string]ITask)
 }
 
-func (m *TaskMan) GetTasks(taskID string, fromStatus, toStatus int, lastHours int) (taskList TaskList) {
+func (m *TaskMan) GetTasks(taskID string, fromStatus, toStatus int, lastHours int, createdBy string) (taskList TaskList) {
 	m.locker.RLock()
 	defer m.locker.RUnlock()
 	if lastHours == 0 {
@@ -29,7 +29,7 @@ func (m *TaskMan) GetTasks(taskID string, fromStatus, toStatus int, lastHours in
 	lastTime := time.Now().Add(time.Duration(-lastHours) * time.Hour).Unix()
 	for k, v := range m.taskList {
 		status := v.GetStatus()
-		if !((taskID != "" && taskID != k) || status < fromStatus || status > toStatus || v.GetCreatedAt().Unix() < lastTime) {
+		if !((createdBy != "" && createdBy != v.GetCreatedBy()) || (taskID != "" && taskID != k) || status < fromStatus || status > toStatus || v.GetCreatedAt().Unix() < lastTime) {
 			taskList = append(taskList, v)
 		}
 	}
@@ -44,8 +44,8 @@ func (m *TaskMan) ManageTask(task ITask) ITask {
 	return task
 }
 
-func GetTasks(taskID string, fromStatus, toStatus int, lastHours int) (taskList TaskList) {
-	return defTaskMan.GetTasks(taskID, fromStatus, toStatus, lastHours)
+func GetTasks(taskID string, fromStatus, toStatus int, lastHours int, createdBy string) (taskList TaskList) {
+	return defTaskMan.GetTasks(taskID, fromStatus, toStatus, lastHours, createdBy)
 }
 
 func ManageTask(task ITask) ITask {
diff --git a/controllers/cms_task.go b/controllers/cms_task.go
index 6d8980568..ebe4d2a72 100644
--- a/controllers/cms_task.go
+++ b/controllers/cms_task.go
@@ -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)
 		}