From 0f15e7b48d064fa6faf99832ca5f4be9bc54e199 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 11 八月 2023 13:41:09 +0800
Subject: [PATCH] fix
---
model/salesRefund.go | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/model/salesRefund.go b/model/salesRefund.go
index e2540c4..e34be5b 100644
--- a/model/salesRefund.go
+++ b/model/salesRefund.go
@@ -18,11 +18,18 @@
IsInvoice int `json:"isInvoice" gorm:"column:is_invoice;type:int;comment:鏄惁寮�绁�"`
Reason string `json:"reason" gorm:"column:reason;type:varchar(255);comment:閫�娆惧師鍥�"`
Products []Product `json:"products" gorm:"many2many:salesRefund_product;"`
+ gorm.Model `json:"-"`
}
SalesRefundSearch struct {
SalesRefund
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
+
}
)
@@ -38,6 +45,9 @@
func (slf *SalesRefundSearch) build() *gorm.DB {
var db = slf.Orm.Model(&SalesRefund{})
+ if slf.Keyword != "" {
+ db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+ }
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
}
@@ -67,14 +77,41 @@
return record, err
}
-func (slf *SalesRefundSearch) FindAll() ([]*SalesRefund, error) {
+func (slf *SalesRefundSearch) FindAll() ([]*SalesRefund, int64, error) {
var db = slf.build()
var records = make([]*SalesRefund, 0)
+ var total int64
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, err
+ }
+ if slf.PageNum > 0 && slf.PageSize > 0 {
+ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
+ }
+
+ if slf.PageNum > 0 && slf.PageSize > 0 {
+ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
+ }
+
err := db.Preload("Products").Find(&records).Error
- return records, err
+ return records, total, err
}
func (slf *SalesRefundSearch) SetId(id int) *SalesRefundSearch {
slf.Id = id
return slf
}
+
+func (slf *SalesRefundSearch) SetKeyword(keyword string) *SalesRefundSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *SalesRefundSearch) SetPage(page, size int) *SalesRefundSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *SalesRefundSearch) SetOrder(order string) *SalesRefundSearch {
+ slf.OrderBy = order
+ return slf
+}
\ No newline at end of file
--
Gitblit v1.8.0