From 440392a932fb2dc8118caf1f4996e7d8b72574a1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 29 四月 2024 19:18:21 +0800
Subject: [PATCH] 编辑纤度检验支持编辑明细并重新生成个人生丝等级
---
models/raw_silk_price_standard.go | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/models/raw_silk_price_standard.go b/models/raw_silk_price_standard.go
index 7f3dea5..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 {
@@ -49,8 +50,17 @@
return slf
}
+func (slf *RawSilkPriceStandardSearch) SetId(id int) *RawSilkPriceStandardSearch {
+ slf.ID = uint(id)
+ return slf
+}
+
func (slf *RawSilkPriceStandardSearch) build() *gorm.DB {
db := slf.Orm.Table(slf.TableName())
+
+ if slf.ID > 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
return db
}
@@ -78,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)
}
@@ -88,9 +98,19 @@
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)
}
return nil
}
+
+func (slf *RawSilkPriceStandardSearch) Delete() error {
+ var db = slf.build()
+
+ if err := db.Unscoped().Delete(&RawSilkPriceStandard{}).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
--
Gitblit v1.8.0