From cd824691bd91525855f2c5e48633ef3caa4740f3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 26 九月 2023 17:49:44 +0800
Subject: [PATCH] update doc
---
service/task.go | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/service/task.go b/service/task.go
index 30f5a3c..40eb45f 100644
--- a/service/task.go
+++ b/service/task.go
@@ -32,10 +32,17 @@
)
// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿鐨勪换鍔�
-func (slf TaskService) GetTask(page, pageSize int, mode TaskMode) (taskResp *response.TaskResponse, code int) {
+func (slf TaskService) GetTask(page, pageSize int, mode TaskMode, channels []int32) (taskResp *response.TaskResponse, code int) {
var taskList []*response.TaskData
var count int64
var workers []*common.ProcedureWorker
+
+ taskResp = &response.TaskResponse{
+ Tasks: taskList,
+ TaskCount: count,
+ Workers: slf.WorkerDistinct(workers),
+ }
+
nowTs := time.Now().Unix()
var (
err error
@@ -56,21 +63,24 @@
search.SetStatusNot(model.ProcedureStatusFinished).
SetStartTimeMax(nowTs).
SetEndTimeMin(nowTs).
- SetOrder("start_time asc, status desc")
+ SetOrder("status desc, start_time asc")
} else if mode == TaskModeLastFinished {
search.SetStatus(model.ProcedureStatusFinished).SetOrder("updated_at desc")
+ if len(channels) > 0 {
+ search.SetChannels(channels)
+ }
}
procedures, err = search.FindNotTotal()
if err != nil {
- return nil, ecode.DBErr
+ return taskResp, ecode.DBErr
}
- count, err = search.Count()
+
if err != nil {
- return nil, ecode.DBErr
+ return taskResp, ecode.DBErr
}
if len(procedures) == 0 {
- return nil, ecode.OK
+ return taskResp, ecode.OK
}
for _, procedure := range procedures {
@@ -78,7 +88,7 @@
}
orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
if err != nil {
- return nil, ecode.DBErr
+ return taskResp, ecode.DBErr
}
orderMap := make(map[string]*model.Order, len(workOrderIds))
@@ -104,6 +114,9 @@
taskList = append(taskList, &taskData)
workers = append(workers, procedure.ProceduresInfo.Workers...)
}
+
+ count, _ = search.SetStatus(model.ProcedureStatusWaitProcess).SetStartTimeMax(nowTs).SetEndTimeMin(nowTs).Count()
+
taskResp = &response.TaskResponse{
Tasks: taskList,
TaskCount: count,
--
Gitblit v1.8.0