From 9e864a183115ba2420797a8bda661187b1069e00 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 23 四月 2024 11:46:41 +0800
Subject: [PATCH] 考勤统计与车间修改
---
models/raw_silk_price_standard.go | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/models/raw_silk_price_standard.go b/models/raw_silk_price_standard.go
index 79fd7cd..05348ab 100644
--- a/models/raw_silk_price_standard.go
+++ b/models/raw_silk_price_standard.go
@@ -7,15 +7,16 @@
"silkserver/pkg/mysqlx"
)
-// RawSilkPriceStandard
+// RawSilkPriceStandard 鐢熶笣瀹氫环绠＄悊
type (
RawSilkPriceStandard struct {
gorm.Model
- MarketNumber string `json:"marketNumber" gorm:"type:varchar(255);comment:搴勫彛缂栧彿"`
- RawSilkGradeNumber string `json:"rawSilkGradeNumber" gorm:"type:varchar(255);comment:鐢熶笣绛夌骇缂栧彿"`
- PayStandard decimal.Decimal `json:"payStandard" gorm:"type:decimal(20,3);comment:钖叕鏍囧噯"`
- Unit string `json:"unit" gorm:"type:varchar(100);comment:鍗曚綅"`
- Notes string `json:"notes" gorm:"type:varchar(255);comment:澶囨敞"`
+ MarketId uint `json:"marketId" gorm:"type:int(11);comment:搴勫彛id"`
+ MarketName string `json:"marketName" gorm:"type:varchar(255);comment:搴勫彛鍚嶇О"`
+ RawSilkGrade string `json:"rawSilkGrade" gorm:"type:varchar(255);comment:鐢熶笣绛夌骇"`
+ PayStandard decimal.Decimal `json:"payStandard" gorm:"type:decimal(20,3);comment:钖叕鏍囧噯"`
+ Unit string `json:"unit" gorm:"type:varchar(100);comment:鍗曚綅"`
+ Notes string `json:"notes" gorm:"type:varchar(255);comment:澶囨敞"`
}
RawSilkPriceStandardSearch struct {
RawSilkPriceStandard
@@ -27,7 +28,7 @@
)
func (slf RawSilkPriceStandard) TableName() string {
- return "raw_silk_price_standard"
+ return "silk_raw_silk_price_standard"
}
func NewRawSilkPriceStandardSearch() *RawSilkPriceStandardSearch {
@@ -87,7 +88,7 @@
if slf.PageNum*slf.PageSize > 0 {
db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
}
- if err := db.Find(&records).Error; err != nil {
+ if err := db.Order("updated_at desc").Find(&records).Error; err != nil {
return records, total, fmt.Errorf("find records err: %v", err)
}
@@ -97,7 +98,7 @@
func (slf *RawSilkPriceStandardSearch) Save(record *RawSilkPriceStandard) 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)
}
--
Gitblit v1.8.0