From 49f56cee1e2285fd32c43f35e3622d2ed6c5fec3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 26 八月 2023 20:09:07 +0800
Subject: [PATCH] plc tag
---
model/work_order.go | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/model/work_order.go b/model/work_order.go
index 6848342..be00fec 100644
--- a/model/work_order.go
+++ b/model/work_order.go
@@ -22,7 +22,7 @@
Unit string `gorm:"type:varchar(100);comment:鍗曚綅" json:"unit"`
StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
- Status OrderStatus `json:"-"`
+ Status OrderStatus
}
OrderSearch struct {
@@ -33,6 +33,7 @@
Orm *gorm.DB
Preload bool
StartTimeMax int64
+ StartTimeMin int64
}
)
@@ -73,6 +74,10 @@
slf.StartTimeMax = ts
return slf
}
+func (slf *OrderSearch) SetStartTimeMin(ts int64) *OrderSearch {
+ slf.StartTimeMin = ts
+ return slf
+}
func (slf *OrderSearch) SetStatus(status OrderStatus) *OrderSearch {
slf.Status = status
@@ -97,7 +102,7 @@
}
if slf.WorkOrderID != "" {
- db = db.Where("work_order_id = ?", slf.OrderID)
+ db = db.Where("work_order_id = ?", slf.WorkOrderID)
}
if slf.Status != 0 {
@@ -108,6 +113,10 @@
db = db.Where("start_time <= ?", slf.StartTimeMax)
}
+ if slf.StartTimeMin != 0 {
+ db = db.Where("start_time >= ?", slf.StartTimeMin)
+ }
+
if slf.Preload {
db = db.Preload("InputMaterials").Preload("OutputMaterials")
}
--
Gitblit v1.8.0