From a455a9d0ca01baa985acb2b69a8d72bee982ed66 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 07 十月 2023 20:52:12 +0800
Subject: [PATCH] gorm版本v2改成v1 fix
---
model/work_order.go | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/model/work_order.go b/model/work_order.go
index 0626042..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"`
@@ -23,7 +23,6 @@
StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
Status OrderStatus
- StatusList []OrderStatus
}
OrderSearch struct {
@@ -35,6 +34,8 @@
Preload bool
StartTimeMax int64
StartTimeMin int64
+ StatusList []OrderStatus
+ WorkOrderIDs []string
}
)
@@ -47,7 +48,7 @@
)
func (slf *Order) TableName() string {
- return "Order"
+ return "work_order"
}
func NewOrderSearch(db *gorm.DB) *OrderSearch {
@@ -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 != ?", slf.StatusList)
+ db = db.Where("status IN (?)", slf.StatusList)
}
if slf.StartTimeMax != 0 {
@@ -166,7 +172,17 @@
return nil
}
-func (slf *OrderSearch) Save(record *Order) error {
+func (slf *OrderSearch) Updates(record *Order) error {
+ var db = slf.build()
+
+ if err := db.Updates(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *OrderSearch) Upsert(record *Order) error {
var db = slf.build()
if err := db.Save(record).Error; err != nil {
--
Gitblit v1.8.0