From f5eb41782ed6584664b797df820423f63490d4d3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 12:12:42 +0800
Subject: [PATCH] 按通道号和查询类型查询任务列表
---
model/procedures.go | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index 4e10260..c1df06c 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -34,11 +34,15 @@
PageSize int
Orm *gorm.DB
Preload bool
+ StartTimeMin int64
StartTimeMax int64
EndTimeMin int64
+ EndTimeMax int64
StatusNot ProcedureStatus
ProcedureIds []string
Channels []int32
+ Offset int
+ Limit int
}
)
@@ -81,6 +85,11 @@
return slf
}
+func (slf *ProceduresSearch) SetOffset(offset, limit int) *ProceduresSearch {
+ slf.Offset, slf.Limit = offset, limit
+ return slf
+}
+
func (slf *ProceduresSearch) SetOrder(order string) *ProceduresSearch {
slf.Order = order
return slf
@@ -96,6 +105,11 @@
return slf
}
+func (slf *ProceduresSearch) SetStartTimeMin(ts int64) *ProceduresSearch {
+ slf.StartTimeMin = ts
+ return slf
+}
+
func (slf *ProceduresSearch) SetStartTimeMax(ts int64) *ProceduresSearch {
slf.StartTimeMax = ts
return slf
@@ -103,6 +117,11 @@
func (slf *ProceduresSearch) SetEndTimeMin(ts int64) *ProceduresSearch {
slf.EndTimeMin = ts
+ return slf
+}
+
+func (slf *ProceduresSearch) SetEndTimeMax(ts int64) *ProceduresSearch {
+ slf.EndTimeMax = ts
return slf
}
@@ -141,6 +160,11 @@
return slf
}
+func (slf *ProceduresSearch) SetChannel(channel int32) *ProceduresSearch {
+ slf.Channel = channel
+ return slf
+}
+
func (slf *ProceduresSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Procedures{})
@@ -168,8 +192,16 @@
db = db.Where("start_time <= ?", slf.StartTimeMax)
}
+ if slf.StartTimeMin != 0 {
+ db = db.Where("start_time >= ?", slf.EndTimeMin)
+ }
+
if slf.EndTimeMin != 0 {
db = db.Where("end_time > ?", slf.EndTimeMin)
+ }
+
+ if slf.EndTimeMax != 0 {
+ db = db.Where("end_time < ?", slf.StartTimeMax)
}
if slf.Status != 0 {
@@ -303,6 +335,11 @@
if slf.PageNum*slf.PageSize > 0 {
db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
}
+
+ if slf.Offset*slf.Limit > 0 {
+ db = db.Offset(slf.Offset).Limit(slf.Limit)
+ }
+
if err := db.Find(&records).Error; err != nil {
return records, total, fmt.Errorf("find records err: %v", err)
}
--
Gitblit v1.8.0