From 12ead07c578158b98f7403aaaa2f96eb12b93f26 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期一, 29 四月 2024 15:16:24 +0800 Subject: [PATCH] 纤度登记检查车间车号配置 --- models/fineness.go | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/models/fineness.go b/models/fineness.go index 4ea1e11..18e6461 100644 --- a/models/fineness.go +++ b/models/fineness.go @@ -11,10 +11,11 @@ // FinenessRegister 绾ゅ害鐧昏 FinenessRegister struct { gorm.Model - Number string `gorm:"type:varchar(255);not null;comment:缂栧彿" json:"number"` //缂栧彿 - FinenessCheckID uint `gorm:"not null;comment:绾ゅ害妫�楠岃〃ID" json:"finenessCheckID"` //绾ゅ害妫�楠岃〃ID - FinishDate string `gorm:"type:varchar(255);not null;comment:钀戒笣鏃堕棿" json:"finishDate"` //钀戒笣鏃堕棿 - Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"name"` //杞﹂棿 + Number string `gorm:"type:varchar(255);not null;comment:缂栧彿" json:"number"` //缂栧彿 + FinenessCheckID uint `gorm:"not null;comment:绾ゅ害妫�楠岃〃ID" json:"finenessCheckID"` //绾ゅ害妫�楠岃〃ID + FinishDate string `gorm:"type:varchar(255);not null;comment:钀戒笣鏃堕棿" json:"finishDate"` //钀戒笣鏃堕棿 + WorkshopNumber string `json:"workshopNumber" gorm:"type:varchar(255);comment:杞﹂棿缂栧彿"` + WorkshopName string `json:"workshopName" gorm:"type:varchar(255);comment:杞﹂棿鍚嶇О"` WorkshopGroup int `gorm:"type:int(11);not null;default:0;comment:杞︾粍" json:"workshopGroup"` //杞︾粍 Market string `gorm:"type:varchar(255);not null;comment:搴勫彛" json:"market"` //搴勫彛 Spec string `gorm:"type:varchar(255);not null;comment:瑙勬牸" json:"spec"` //瑙勬牸 @@ -79,8 +80,8 @@ return slf } -func (slf *FinenessRegisterSearch) SetWorkshop(workshop string) *FinenessRegisterSearch { - slf.Workshop = workshop +func (slf *FinenessRegisterSearch) SetWorkshopName(workshop string) *FinenessRegisterSearch { + slf.WorkshopName = workshop return slf } @@ -117,8 +118,8 @@ db = db.Where("number like ?", fmt.Sprintf("%%%s%%", slf.Keyword)) } - if slf.Workshop != "" { - db = db.Where("workshop = ?", slf.Workshop) + if slf.WorkshopName != "" { + db = db.Where("workshop_name = ?", slf.WorkshopName) } if slf.Market != "" { -- Gitblit v1.8.0