From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 25 四月 2024 10:02:01 +0800 Subject: [PATCH] 更改定时任务时区设置 --- model/task_status_sync.go | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/model/task_status_sync.go b/model/task_status_sync.go index e1eead2..63d1428 100644 --- a/model/task_status_sync.go +++ b/model/task_status_sync.go @@ -1,6 +1,7 @@ package model import ( + "apsClient/constvar" "apsClient/pkg/sqlitex" "fmt" "github.com/jinzhu/gorm" @@ -9,14 +10,17 @@ type ( // TaskStatusSync 浠诲姟鐘舵�佸悓姝� TaskStatusSync struct { - gorm.Model - WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿 - ProductProcedureID string `gorm:"type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id - ProcedureID string `json:"procedureId"` // 宸ュ簭缂栧彿 - DeviceId string `json:"deviceId"` //璁惧缂栧彿 - IsProcessing bool //鏄惁澶勭悊涓� - IsFinish bool //鏄惁瀹屾垚 - Ts int64 //鍙戠敓鏃堕棿 + CommonModel + WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿 + ProductProcedureID string `gorm:"type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id + ProcedureID string `json:"procedureId"` // 宸ュ簭缂栧彿 + DeviceId string `json:"deviceId"` //璁惧缂栧彿 + IsProcessing bool //鏄惁澶勭悊涓� + IsFinish bool //鏄惁瀹屾垚 + StartTs int64 `json:"start_ts"` //寮�濮嬫椂闂� + FinishTs int64 `json:"finish_ts"` //缁撴潫鏃堕棿 + FinishedQuantity int `json:"finishedQuantity"` + SyncStatus constvar.SyncStatus `json:"-"` } TaskStatusSyncSearch struct { @@ -26,6 +30,7 @@ PageSize int Orm *gorm.DB IDs []uint + SyncWait bool } ) @@ -65,8 +70,18 @@ return slf } +func (slf *TaskStatusSyncSearch) SetWorkOrderId(workOrderId string) *TaskStatusSyncSearch { + slf.WorkOrderId = workOrderId + return slf +} + func (slf *TaskStatusSyncSearch) SetIDs(ids []uint) *TaskStatusSyncSearch { slf.IDs = ids + return slf +} + +func (slf *TaskStatusSyncSearch) SetSyncWait() *TaskStatusSyncSearch { + slf.SyncWait = true return slf } @@ -89,6 +104,14 @@ db = db.Order(slf.Order) } + if slf.WorkOrderId != "" { + db = db.Where("work_order_id = ?", slf.WorkOrderId) + } + + if slf.SyncWait { + db = db.Where("sync_status != ?", constvar.SyncStatusOk) + } + return db } -- Gitblit v1.8.0