From 000d7434525d4b7743e4b8e1f6b2a6aa5357bf12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 四月 2024 15:11:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer
---
models/workshop_manage.go | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/models/workshop_manage.go b/models/workshop_manage.go
index f1bdc07..db0e30f 100644
--- a/models/workshop_manage.go
+++ b/models/workshop_manage.go
@@ -12,6 +12,7 @@
WorkshopManage struct {
gorm.Model
WorkshopNumber string `json:"workshopNumber" gorm:"type:varchar(255);comment:杞﹂棿缂栧彿"`
+ WorkshopName string `json:"workshopName" gorm:"type:varchar(255);comment:杞﹂棿鍚嶇О"`
GroupNumber int `json:"groupNumber" gorm:"type:int(11);comment:缁勫埆"`
StartCarNumber int `json:"startCarNumber" gorm:"type:int(11);comment:寮�濮嬭溅鍙�"`
EndCarNumber int `json:"endCarNumber" gorm:"type:int(11);comment:缁撴潫杞﹀彿"`
@@ -55,6 +56,11 @@
return slf
}
+func (slf *WorkshopManageSearch) SetWorkshopName(workshopName string) *WorkshopManageSearch {
+ slf.WorkshopName = workshopName
+ return slf
+}
+
func (slf *WorkshopManageSearch) SetGroupNumber(groupNumber int) *WorkshopManageSearch {
slf.GroupNumber = groupNumber
return slf
@@ -74,6 +80,10 @@
if slf.WorkshopNumber != "" {
db = db.Where("workshop_number = ?", slf.WorkshopNumber)
+ }
+
+ if slf.WorkshopName != "" {
+ db = db.Where("workshop_name = ?", slf.WorkshopName)
}
if slf.GroupNumber != 0 {
@@ -129,7 +139,7 @@
func (slf *WorkshopManageSearch) Save(record *WorkshopManage) error {
var db = slf.build()
- if err := db.Save(record).Error; err != nil {
+ if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
return fmt.Errorf("save err: %v, record: %+v", err, record)
}
@@ -145,3 +155,15 @@
return nil
}
+
+func (slf *WorkshopManageSearch) Count() (int64, error) {
+ var (
+ total int64
+ db = slf.build()
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return total, fmt.Errorf("find count err: %v", err)
+ }
+ return total, nil
+}
--
Gitblit v1.8.0