From 94a760e098571a4657c93985a89ec084f8df357c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 14:02:43 +0800
Subject: [PATCH] 当返回的任务数不足通道数时,按通道号查询已完成的,补齐

---
 model/procedures.go |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/model/procedures.go b/model/procedures.go
index 8d893e6..cb8d660 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -36,6 +36,7 @@
 		EndTimeMin   int64
 		StatusNot    ProcedureStatus
 		ProcedureIds []string
+		Channels     []int32
 	}
 )
 
@@ -133,6 +134,11 @@
 	return slf
 }
 
+func (slf *ProceduresSearch) SetChannels(channels []int32) *ProceduresSearch {
+	slf.Channels = channels
+	return slf
+}
+
 func (slf *ProceduresSearch) build() *gorm.DB {
 	var db = slf.Orm.Model(&Procedures{})
 
@@ -180,6 +186,10 @@
 		db = db.Where("procedure_id = ?", slf.ProcedureID)
 	}
 
+	if len(slf.Channels) > 0 {
+		db = db.Where("channel in ?", slf.Channels)
+	}
+
 	return db
 }
 

--
Gitblit v1.8.0