From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 25 四月 2024 10:02:01 +0800 Subject: [PATCH] 更改定时任务时区设置 --- model/process_model.go | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/model/process_model.go b/model/process_model.go index bedda26..dbea7b4 100644 --- a/model/process_model.go +++ b/model/process_model.go @@ -11,7 +11,7 @@ type ( // ProcessModel 宸ヨ壓鍙傛暟 ProcessModel struct { - gorm.Model `json:"-"` + CommonModel Number string `gorm:"index;column:number;type:varchar(255);not null;default ''" json:"number"` //宸ヨ壓妯″瀷缂栧彿 Product string `gorm:"column:product;type:varchar(255);not null;default ''" json:"product"` //浜у搧鍚嶇О Procedure string `gorm:"column:procedure;type:varchar(255);not null;default ''" json:"procedure"` //宸ュ簭 @@ -32,6 +32,9 @@ Orm *gorm.DB Procedures []string CurrentNumber string + Numbers []string + ProductNot string + ProcedureNot string } ) @@ -77,6 +80,11 @@ return slf } +func (slf *ProcessModelSearch) SetNumbers(numbers []string) *ProcessModelSearch { + slf.Numbers = numbers + return slf +} + func (slf *ProcessModelSearch) SetCurrentNumber(number string) *ProcessModelSearch { slf.CurrentNumber = number return slf @@ -89,6 +97,11 @@ func (slf *ProcessModelSearch) SetProcedure(procedure string) *ProcessModelSearch { slf.Procedure = procedure + return slf +} + +func (slf *ProcessModelSearch) SetProductAndProcedureNot(product string, procedure string) *ProcessModelSearch { + slf.ProductNot, slf.ProcedureNot = product, procedure return slf } @@ -117,6 +130,10 @@ db = db.Where("`procedure` = ?", slf.Procedure) } + if len(slf.ProductNot) != 0 && len(slf.ProcedureNot) != 0 { + db = db.Not("product = ? and procedure = ? ", slf.ProductNot, slf.ProcedureNot) + } + if len(slf.Procedures) != 0 { db = db.Where("`procedure` IN (?)", slf.Procedures) } @@ -137,6 +154,10 @@ db = db.Where("number != ?", slf.CurrentNumber) } + if len(slf.Numbers) != 0 { + db = db.Where("number in (?)", slf.Numbers) + } + return db } -- Gitblit v1.8.0