From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
model/procedures.go | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index 7f8c8b9..79e3842 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -7,13 +7,15 @@
"encoding/json"
"fmt"
"github.com/jinzhu/gorm"
+ "strings"
)
type (
Procedures struct {
gorm.Model
- WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"-"`
- OrderID string `gorm:"index;type:varchar(191);not null" json:"-"`
+ ProductProcedureID string `gorm:"index;type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
+ WorkOrderID string `gorm:"index;type:varchar(191);" json:"-"`
+ OrderID string `gorm:"index;type:varchar(191);" json:"-"`
DeviceID string `gorm:"index;type:varchar(191)" json:"deviceId"`
ProcedureID string `gorm:"index;type:varchar(191)" json:"procedureId"`
Channel int32 `gorm:"index;" json:"channel"` //閫氶亾
@@ -22,6 +24,7 @@
EndTime int64 `json:"endTime"`
RealStartTime int64 `json:"realStartTime"`
RealEndTime int64 `json:"realEndTime"`
+ FinishedQuantity int `gorm:"type:int;" json:"finishedQuantity"`
Status ProcedureStatus
ProcedureData string `json:"-"` //common.ProductProcedure json涓�
ProceduresInfo common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure 瀵硅薄
@@ -43,6 +46,7 @@
Channels []int32
Offset int
Limit int
+ Fields []string
}
)
@@ -58,13 +62,15 @@
return "procedures"
}
func (slf *Procedures) AfterFind(db *gorm.DB) error {
- var proceduresInfo common.ProductProcedure
- err := json.Unmarshal([]byte(slf.ProcedureData), &proceduresInfo)
- if err != nil {
- logx.Errorf("AfterFind Unmarshal err: %v", err.Error())
- return err
+ if slf.ProcedureData != "" {
+ var proceduresInfo common.ProductProcedure
+ err := json.Unmarshal([]byte(slf.ProcedureData), &proceduresInfo)
+ if err != nil {
+ logx.Errorf("AfterFind Unmarshal err: %v", err.Error())
+ return err
+ }
+ slf.ProceduresInfo = proceduresInfo
}
- slf.ProceduresInfo = proceduresInfo
return nil
}
@@ -160,8 +166,8 @@
return slf
}
-func (slf *ProceduresSearch) SetChannel(channel int32) *ProceduresSearch {
- slf.Channel = channel
+func (slf *ProceduresSearch) SetFields(fields []string) *ProceduresSearch {
+ slf.Fields = fields
return slf
}
@@ -193,7 +199,7 @@
}
if slf.StartTimeMin != 0 {
- db = db.Where("start_time >= ?", slf.EndTimeMin)
+ db = db.Where("start_time >= ?", slf.StartTimeMin)
}
if slf.EndTimeMin != 0 {
@@ -201,7 +207,7 @@
}
if slf.EndTimeMax != 0 {
- db = db.Where("end_time < ?", slf.StartTimeMax)
+ db = db.Where("end_time < ?", slf.EndTimeMax)
}
if slf.Status != 0 {
@@ -224,6 +230,10 @@
db = db.Where("channel IN (?)", slf.Channels)
}
+ if len(slf.Fields) > 0 {
+ db = db.Select(strings.Join(slf.Fields, ","))
+ }
+
return db
}
--
Gitblit v1.8.0