From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 28 七月 2023 10:21:33 +0800
Subject: [PATCH] fix
---
model/salesReturn.go | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/model/salesReturn.go b/model/salesReturn.go
index d72c54c..94e1232 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -8,20 +8,25 @@
type (
SalesReturn struct {
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
- Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閫�璐у崟鍙�"`
- Repository string `json:"repository" gorm:"column:repository;type:varchar(255);comment:浠撳簱"`
- MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
- ReturnDate time.Time `json:"returnDate" gorm:"column:return_date;type:datetime;comment:閫�璐ф棩鏈�"`
- Status int `json:"status" gorm:"column:status;type:int;comment:閫�璐х姸鎬�"`
- Reason string `json:"reason" gorm:"column:reason;type:varchar(255);comment:閫�璐у師鍥�"`
- Products []Product `json:"products" gorm:"many2many:salesReturn_product;"`
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閫�璐у崟鍙�"`
+ Repository string `json:"repository" gorm:"column:repository;type:varchar(255);comment:浠撳簱"`
+ MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+ ReturnDate time.Time `json:"returnDate" gorm:"column:return_date;type:datetime;comment:閫�璐ф棩鏈�"`
+ SalesReturnStatus int `json:"salesReturnStatus" gorm:"column:sales_return_status;type:int;comment:閫�璐х姸鎬�"`
+ Reason string `json:"reason" gorm:"column:reason;type:varchar(255);comment:閫�璐у師鍥�"`
+ Products []Product `json:"products" gorm:"many2many:salesReturn_product;"`
}
SalesReturnSearch struct {
SalesReturn
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -37,6 +42,9 @@
func (slf *SalesReturnSearch) build() *gorm.DB {
var db = slf.Orm.Model(&SalesReturn{})
+ if slf.Keyword != "" {
+ db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+ }
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
}
@@ -66,14 +74,37 @@
return record, err
}
-func (slf *SalesReturnSearch) FindAll() ([]*SalesReturn, error) {
+func (slf *SalesReturnSearch) FindAll() ([]*SalesReturn, int64, error) {
var db = slf.build()
- var record = make([]*SalesReturn, 0)
- err := db.Preload("Products").Find(&record).Error
- return record, err
+ var records = make([]*SalesReturn, 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)
+ }
+
+ err := db.Preload("Products").Find(&records).Error
+ return records, total, err
}
func (slf *SalesReturnSearch) SetId(id int) *SalesReturnSearch {
slf.Id = id
return slf
}
+
+func (slf *SalesReturnSearch) SetKeyword(keyword string) *SalesReturnSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *SalesReturnSearch) SetPage(page, size int) *SalesReturnSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *SalesReturnSearch) SetOrder(order string) *SalesReturnSearch {
+ slf.OrderBy = order
+ return slf
+}
\ No newline at end of file
--
Gitblit v1.8.0