From 066a30751bdc20f9e83b34539de71ae392783e1b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 19 八月 2023 15:58:09 +0800
Subject: [PATCH] 网络配置获取和删除，品牌增删改查
---
model/procedures.go | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index c2803d1..a1fb11b 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"
@@ -18,8 +18,8 @@
StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
Status ProcedureStatus
- ProcedureData string `json:"-"` //request.ProductProcedure json涓�
- ProceduresInfo request.ProductProcedure `json:"procedure" gorm:"-"` //request.ProductProcedure 瀵硅薄
+ ProcedureData string `json:"-"` //common.ProductProcedure json涓�
+ ProceduresInfo common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure 瀵硅薄
}
ProceduresSearch struct {
@@ -44,7 +44,7 @@
return "procedures"
}
func (slf *Procedures) AfterFind(db *gorm.DB) error {
- var proceduresInfo request.ProductProcedure
+ var proceduresInfo common.ProductProcedure
err := json.Unmarshal([]byte(slf.ProcedureData), &proceduresInfo)
if err != nil {
logx.Errorf("AfterFind Unmarshal err: %v", err.Error())
@@ -107,6 +107,10 @@
db = db.Order(slf.Order)
}
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
if slf.WorkOrderID != "" {
db = db.Where("work_order_id = ?", slf.WorkOrderID)
}
--
Gitblit v1.8.0