From 9e864a183115ba2420797a8bda661187b1069e00 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 23 四月 2024 11:46:41 +0800
Subject: [PATCH] 考勤统计与车间修改
---
models/fineness_check.go | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/models/fineness_check.go b/models/fineness_check.go
index 3bdecfe..278189c 100644
--- a/models/fineness_check.go
+++ b/models/fineness_check.go
@@ -18,9 +18,9 @@
Deviation decimal.Decimal `gorm:"type:decimal(12,2);not null;comment:鍋忓樊" json:"deviation"` //鍋忓樊
TotalDeviation decimal.Decimal `gorm:"type:decimal(12,2);not null;comment:鎬诲樊" json:"totalDeviation"` //鎬诲樊
FinenessGrade string `gorm:"type:varchar(255);not null;comment:绾ゅ害绛夌骇" json:"finenessGrade"` //绾ゅ害绛夌骇
- Cleanliness string `gorm:"type:varchar(255);not null;comment:娓呮磥搴�" json:"cleanliness"` //娓呮磥搴�
- Purity string `gorm:"type:varchar(255);not null;comment:娲佸噣搴�" json:"purity"` //娲佸噣搴�
- TwiceChange string `gorm:"type:varchar(255);not null;comment:浜屽害鍙樺寲" json:"twiceChange"` //浜屽害鍙樺寲
+ Cleanliness decimal.Decimal `gorm:"type:varchar(255);not null;comment:娓呮磥搴�" json:"cleanliness"` //娓呮磥搴�
+ Purity decimal.Decimal `gorm:"type:varchar(255);not null;comment:娲佸噣搴�" json:"purity"` //娲佸噣搴�
+ TwiceChange decimal.Decimal `gorm:"type:varchar(255);not null;comment:浜屽害鍙樺寲" json:"twiceChange"` //浜屽害鍙樺寲
MarketProcessOrderNumber string `gorm:"type:varchar(255);not null;comment:搴勫彛宸ヨ壓鍗曠紪鍙�" json:"marketProcessOrderNumber"` //搴勫彛宸ヨ壓鍗曠紪鍙�
Inspector string `gorm:"type:varchar(255);not null;comment:妫�楠屽憳" json:"inspector"` //妫�楠屽憳
}
@@ -31,11 +31,12 @@
PageSize int
Orm *gorm.DB
Preload bool
+ Keyword string
}
)
func (slf *FinenessCheck) TableName() string {
- return "fineness_check"
+ return "silk_fineness_check"
}
func NewFinenessCheckSearch() *FinenessCheckSearch {
@@ -67,6 +68,16 @@
return slf
}
+func (slf *FinenessCheckSearch) SetFinenessRegisterID(id uint) *FinenessCheckSearch {
+ slf.FinenessRegisterID = id
+ return slf
+}
+
+func (slf *FinenessCheckSearch) SetKeyword(keyword string) *FinenessCheckSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
func (slf *FinenessCheckSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
@@ -77,6 +88,15 @@
if slf.Order != "" {
db = db.Order(slf.Order)
}
+
+ if slf.Keyword != "" {
+ db = db.Where("number like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
+ }
+
+ if slf.FinenessRegisterID != 0 {
+ db = db.Where("fineness_register_id = ?", slf.FinenessRegisterID)
+ }
+
if slf.Preload {
db = db.Model(&FinenessCheck{}).Preload("FinenessRegister")
}
--
Gitblit v1.8.0