From d440849e7acbd04b389dae5f3bbb0769dacb264e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 19:19:41 +0800
Subject: [PATCH] merge master
---
model/work_order.go | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/model/work_order.go b/model/work_order.go
index 347d0ea..f92db69 100644
--- a/model/work_order.go
+++ b/model/work_order.go
@@ -3,13 +3,13 @@
import (
"apsClient/pkg/sqlitex"
"fmt"
+ "github.com/jinzhu/gorm"
"github.com/shopspring/decimal"
- "gorm.io/gorm"
)
type (
Order struct {
- gorm.Model `json:"-"`
+ gorm.Model
WorkOrderID string `gorm:"index;type:varchar(191);not null;comment:宸ュ崟ID" json:"workOrderId"`
OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"orderId"`
ProductID string `gorm:"type:varchar(191);comment:浜у搧ID" json:"productId"`
@@ -35,6 +35,7 @@
StartTimeMax int64
StartTimeMin int64
StatusList []OrderStatus
+ WorkOrderIDs []string
}
)
@@ -101,6 +102,11 @@
return slf
}
+func (slf *OrderSearch) SetWorkOrderIds(workOrderIds []string) *OrderSearch {
+ slf.WorkOrderIDs = workOrderIds
+ return slf
+}
+
func (slf *OrderSearch) SetId(id uint) *OrderSearch {
slf.ID = id
return slf
@@ -126,7 +132,7 @@
}
if len(slf.StatusList) != 0 {
- db = db.Where("status in ?", slf.StatusList)
+ db = db.Where("status IN (?)", slf.StatusList)
}
if slf.StartTimeMax != 0 {
--
Gitblit v1.8.0