From 8dfb8feb32bb5e4e460e23dcde42612a26fa2bcb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 27 八月 2023 01:11:28 +0800
Subject: [PATCH] fix
---
model/procedures.go | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index 5ac3185..48534b3 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -1,7 +1,7 @@
package model
import (
- "apsClient/model/request"
+ "apsClient/model/common"
"apsClient/pkg/logx"
"apsClient/pkg/sqlitex"
"encoding/json"
@@ -12,11 +12,14 @@
type (
Procedures struct {
gorm.Model `json:"-"`
- ID int `gorm:"primarykey"`
- OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"-"`
- Status ProcedureStatus `json:"-"`
- ProcedureData string `json:"-"` //request.ProductProcedure json涓�
- ProceduresInfo request.ProductProcedure `json:"procedure" gorm:"-"` //request.ProductProcedure 瀵硅薄
+ ID int `gorm:"primarykey"`
+ WorkOrderID string `gorm:"index;type:varchar(191);not null;comment:宸ュ崟ID" json:"-"`
+ OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"-"`
+ StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
+ EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
+ Status ProcedureStatus
+ ProcedureData string `json:"-"` //common.ProductProcedure json涓�
+ ProceduresInfo common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure 瀵硅薄
}
ProceduresSearch struct {
@@ -27,27 +30,30 @@
Orm *gorm.DB
Preload bool
StartTimeMax int64
+ StatusNot ProcedureStatus
}
)
type ProcedureStatus int
const (
- ProcedureStatusUnFinished ProcedureStatus = 1
- ProcedureStatusFinished ProcedureStatus = 2
+ ProcedureStatusWaitProcess ProcedureStatus = 1
+ ProcedureStatusProcessing ProcedureStatus = 2
+ ProcedureStatusFinished ProcedureStatus = 3
)
func (slf *Procedures) TableName() string {
return "procedures"
}
-func (slf *Procedures) AfterFind() {
- var proceduresInfo request.ProductProcedure
+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
+ return err
}
slf.ProceduresInfo = proceduresInfo
+ return nil
}
func NewProceduresSearch(db *gorm.DB) *ProceduresSearch {
@@ -72,8 +78,8 @@
return slf
}
-func (slf *ProceduresSearch) SetOrderId(orderId string) *ProceduresSearch {
- slf.OrderID = orderId
+func (slf *ProceduresSearch) SetWorkOrderId(orderId string) *ProceduresSearch {
+ slf.WorkOrderID = orderId
return slf
}
func (slf *ProceduresSearch) SetStartTimeMax(ts int64) *ProceduresSearch {
@@ -91,6 +97,11 @@
return slf
}
+func (slf *ProceduresSearch) SetStatusNot(status ProcedureStatus) *ProceduresSearch {
+ slf.StatusNot = status
+ return slf
+}
+
func (slf *ProceduresSearch) SetPreload(preload bool) *ProceduresSearch {
slf.Preload = preload
return slf
@@ -103,8 +114,12 @@
db = db.Order(slf.Order)
}
- if slf.OrderID != "" {
- db = db.Where("order_id = ?", slf.OrderID)
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
+ if slf.WorkOrderID != "" {
+ db = db.Where("work_order_id = ?", slf.WorkOrderID)
}
if slf.Preload {
@@ -119,6 +134,10 @@
db = db.Where("status = ?", slf.Status)
}
+ if slf.StatusNot != 0 {
+ db = db.Where("status != ?", slf.StatusNot)
+ }
+
return db
}
--
Gitblit v1.8.0