From 5b84285b7b1feec082deaeb12d8a2240a0c4b64b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 九月 2023 16:23:34 +0800
Subject: [PATCH] 获取任务，未完成的开始时间小于等于当前时间，结束时间大于当前时间的任务
---
service/task.go | 3 ++-
model/procedures.go | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index 99e45f4..8933c88 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -33,6 +33,7 @@
Orm *gorm.DB
Preload bool
StartTimeMax int64
+ EndTimeMin int64
StatusNot ProcedureStatus
ProcedureIds []string
}
@@ -97,6 +98,11 @@
return slf
}
+func (slf *ProceduresSearch) SetEndTimeMin(ts int64) *ProceduresSearch {
+ slf.EndTimeMin = ts
+ return slf
+}
+
func (slf *ProceduresSearch) SetId(id int) *ProceduresSearch {
slf.ID = id
return slf
@@ -154,6 +160,10 @@
db = db.Where("start_time <= ?", slf.StartTimeMax)
}
+ if slf.EndTimeMin != 0 {
+ db = db.Where("end_time > ?", slf.EndTimeMin)
+ }
+
if slf.Status != 0 {
db = db.Where("status = ?", slf.Status)
}
diff --git a/service/task.go b/service/task.go
index 64a72df..c07bbc8 100644
--- a/service/task.go
+++ b/service/task.go
@@ -23,7 +23,7 @@
return &TaskService{}
}
-// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
+// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿
func (slf TaskService) GetTask(page, pageSize int) (taskResp *response.TaskResponse, code int) {
var taskList []*response.TaskData
var count int64
@@ -37,6 +37,7 @@
)
procedures, err = model.NewProceduresSearch(nil).SetOrder("start_time asc").
SetStartTimeMax(nowTs).
+ SetEndTimeMin(nowTs).
SetDeviceId(conf.Conf.System.DeviceId).
SetStatusNot(model.ProcedureStatusFinished).
SetPage(page, pageSize).
--
Gitblit v1.8.0