From c6173b62e0fea3116075d56692b73cc0bc624815 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 27 八月 2023 00:54:56 +0800
Subject: [PATCH] 逻辑修改
---
model/work_order.go | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/model/work_order.go b/model/work_order.go
index be00fec..0626042 100644
--- a/model/work_order.go
+++ b/model/work_order.go
@@ -23,6 +23,7 @@
StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
Status OrderStatus
+ StatusList []OrderStatus
}
OrderSearch struct {
@@ -40,8 +41,9 @@
type OrderStatus int
const (
- OrderStatusUnFinished OrderStatus = 1
- OrderStatusFinished OrderStatus = 2
+ OrderStatusWaitProcess OrderStatus = 1
+ OrderStatusProcessing OrderStatus = 2
+ OrderStatusFinished OrderStatus = 3
)
func (slf *Order) TableName() string {
@@ -84,6 +86,11 @@
return slf
}
+func (slf *OrderSearch) SetStatusList(statusList []OrderStatus) *OrderSearch {
+ slf.StatusList = statusList
+ return slf
+}
+
func (slf *OrderSearch) SetPreload(preload bool) *OrderSearch {
slf.Preload = preload
return slf
@@ -94,11 +101,20 @@
return slf
}
+func (slf *OrderSearch) SetId(id uint) *OrderSearch {
+ slf.ID = id
+ return slf
+}
+
func (slf *OrderSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Order{})
if slf.OrderBy != "" {
db = db.Order(slf.OrderBy)
+ }
+
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
}
if slf.WorkOrderID != "" {
@@ -109,6 +125,10 @@
db = db.Where("status = ?", slf.Status)
}
+ if len(slf.StatusList) != 0 {
+ db = db.Where("status != ?", slf.StatusList)
+ }
+
if slf.StartTimeMax != 0 {
db = db.Where("start_time <= ?", slf.StartTimeMax)
}
--
Gitblit v1.8.0