From dac214fa72dc2974954a4d8ee934695f548ad155 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 02 八月 2023 14:14:30 +0800
Subject: [PATCH] fix
---
model/salesDetails.go | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/model/salesDetails.go b/model/salesDetails.go
index d2c4ee9..dbcaa26 100644
--- a/model/salesDetails.go
+++ b/model/salesDetails.go
@@ -24,12 +24,21 @@
Conditions string `json:"conditions" gorm:"column:conditions;type:text;comment:鏉′欢"`
Remark string `json:"remark" gorm:"column:remark;type:text;comment:澶囨敞"`
Products []Product `json:"products" gorm:"many2many:salesDetails_product;"`
+ LogisticCompany string `json:"logisticCompany" gorm:"column:logistic_company;type:varchar(255);comment:鐗╂祦鍏徃"`
+ LogisticNumber string `json:"logisticNumber" gorm:"column:logistic_number;type:varchar(255);comment:鐗╂祦鍗曞彿"`
+ LogisticCost float64 `json:"logisticCost" gorm:"column:logistic_cost;type:decimal(10,2);comment:鐗╂祦璐圭敤"`
gorm.Model `json:"-"`
}
SalesDetailsSearch struct {
SalesDetails
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
+
}
)
@@ -45,6 +54,9 @@
func (slf *SalesDetailsSearch) build() *gorm.DB {
var db = slf.Orm.Model(&SalesDetails{})
+ if slf.Keyword != "" {
+ db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+ }
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
}
@@ -79,9 +91,36 @@
return record, err
}
-func (slf *SalesDetailsSearch) FindAll() ([]*SalesDetails, error) {
+func (slf *SalesDetailsSearch) FindAll() ([]*SalesDetails, int64, error) {
var db = slf.build()
var records = make([]*SalesDetails, 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").Preload("Client").Find(&records).Error
- return records, err
+ return records, total, err
}
+
+func (slf *SalesDetailsSearch) SetKeyword(keyword string) *SalesDetailsSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *SalesDetailsSearch) SetPage(page, size int) *SalesDetailsSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *SalesDetailsSearch) SetOrder(order string) *SalesDetailsSearch {
+ slf.OrderBy = order
+ return slf
+}
\ No newline at end of file
--
Gitblit v1.8.0