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_rank_standard.go | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/models/raw_silk_rank_standard.go b/models/raw_silk_rank_standard.go
index b1ee31d..2b72ffc 100644
--- a/models/raw_silk_rank_standard.go
+++ b/models/raw_silk_rank_standard.go
@@ -16,8 +16,12 @@
CheckItem constvar.CheckItem `json:"checkItem" gorm:"type:int;comment:妫�鏌ラ」鐩悕绉�"`
StartFineness decimal.Decimal `json:"startFineness" gorm:"type:decimal(20,4);comment:寮�濮嬬氦搴�"`
EndFineness decimal.Decimal `json:"endFineness" gorm:"type:decimal(20,4);comment:缁撴潫绾ゅ害"`
+ RankA decimal.Decimal `json:"rankA" gorm:"type:decimal(20,4);comment:閲庣氦"`
+ RankB decimal.Decimal `json:"rankB" gorm:"type:decimal(20,4);comment:澶ч噹"`
+ RankC decimal.Decimal `json:"rankC" gorm:"type:decimal(20,4);comment:鐗归噹"`
+ RankProp string `json:"rankProp" gorm:"type:varchar(255);comment:鍓嶇紑key"`
RankName string `json:"rankName" gorm:"type:varchar(255);comment:绛夌骇鍚嶇О"`
- RankValue string `json:"rankValue" gorm:"type:varchar(255);comment:绛夌骇鍊�"`
+ RankValue decimal.Decimal `json:"rankValue" gorm:"type:decimal(20,4);comment:绛夌骇鍊�"`
}
RawSilkRankStandardSearch struct {
RawSilkRankStandard
@@ -28,7 +32,7 @@
)
func (slf RawSilkRankStandard) TableName() string {
- return "raw_silk_price_standard"
+ return "silk_raw_silk_rank_standard"
}
func NewRawSilkRankStandardSearch() *RawSilkRankStandardSearch {
@@ -45,11 +49,20 @@
return slf
}
+func (slf *RawSilkRankStandardSearch) SetFineness(start, end decimal.Decimal) *RawSilkRankStandardSearch {
+ slf.StartFineness, slf.EndFineness = start, end
+ return slf
+}
+
func (slf *RawSilkRankStandardSearch) build() *gorm.DB {
db := slf.Orm.Table(slf.TableName())
if slf.ID > 0 {
db = db.Where("id = ?", slf.ID)
+ }
+
+ if !slf.StartFineness.IsZero() || !slf.EndFineness.IsZero() {
+ db = db.Where("start_fineness = ? and end_fineness = ?", slf.StartFineness, slf.EndFineness)
}
return db
@@ -65,24 +78,28 @@
return nil
}
-func (slf *RawSilkRankStandardSearch) Find() ([]*RawSilkRankStandard, int64, error) {
+// CreateBatch 鎵归噺鎻掑叆
+func (slf *RawSilkRankStandardSearch) CreateBatch(records []*RawSilkRankStandard) error {
+ var db = slf.build()
+
+ if err := db.Create(&records).Error; err != nil {
+ return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+ }
+
+ return nil
+}
+
+func (slf *RawSilkRankStandardSearch) FindNotTotal() ([]*RawSilkRankStandard, error) {
var (
records = make([]*RawSilkRankStandard, 0)
- total int64
db = slf.build()
)
- if err := db.Count(&total).Error; err != nil {
- return records, total, fmt.Errorf("find count err: %v", err)
- }
- 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 {
- return records, total, fmt.Errorf("find records err: %v", err)
+ return records, fmt.Errorf("find records err: %v", err)
}
- return records, total, nil
+ return records, nil
}
func (slf *RawSilkRankStandardSearch) Save(record *RawSilkRankStandard) error {
@@ -95,10 +112,10 @@
return nil
}
-func (slf *RawSilkRankStandardSearch) Delete() error {
+func (slf *RawSilkRankStandardSearch) DeleteAll() error {
var db = slf.build()
- if err := db.Unscoped().Delete(&RawSilkRankStandard{}).Error; err != nil {
+ if err := db.Where("1=1").Delete(&RawSilkRankStandard{}).Error; err != nil {
return err
}
--
Gitblit v1.8.0