From 7788cb0ea88354718b2ad04ac29aea24e0b64911 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 九月 2023 20:19:29 +0800
Subject: [PATCH] 增加当前时间可以开始但是未开始的任务接口，增加是否可以开始字段

---
 api/v1/task.go |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 11a1332..8fbc448 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -66,7 +66,49 @@
 		params.PageSize = 1
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	if code != ecode.OK {
+		ctx.Fail(code)
+		return
+	}
+	if len(taskResponse.Tasks) == 0 {
+		taskResponse, code = service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeLastFinished) //鍙栦笂涓�涓畬鎴愮殑
+		if code != ecode.OK {
+			ctx.Fail(code)
+			return
+		}
+	}
+
+	for _, task := range taskResponse.Tasks {
+		if task.Procedure.Status == model.ProcedureStatusWaitProcess {
+			task.CanStarted = true
+		}
+	}
+
+	ctx.OkWithDetailed(taskResponse)
+}
+
+// TaskGetUnStarted
+// @Tags      Task
+// @Summary   鑾峰彇鏈紑濮嬬殑浠诲姟
+// @Produce   application/json
+// @Param     object  query    request.TaskList true  "鏌ヨ鍙傛暟"
+// @Success   200   {object}  contextx.Response{data=response.TaskData}  "鎴愬姛"
+// @Router    /v1/task/get/unStarted [get]
+func (slf *TaskApi) TaskGetUnStarted(c *gin.Context) {
+	var params request.TaskList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+	if params.Page <= 0 {
+		params.Page = 1
+	}
+	if params.PageSize <= 0 {
+		params.PageSize = 1
+	}
+
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted) //鏃堕棿鍒颁簡鏈紑濮嬬殑
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return

--
Gitblit v1.8.0