From b4201a0054369a8cd89e940947fd6f1a89f357c2 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 02 八月 2023 13:38:24 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 model/saleChance.go |   60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/model/saleChance.go b/model/saleChance.go
index fdfb54b..320cafb 100644
--- a/model/saleChance.go
+++ b/model/saleChance.go
@@ -45,9 +45,14 @@
 		gorm.Model `json:"-"`
 	}
 
-	SaleChangeSearch struct {
+	SaleChanceSearch struct {
 		SaleChance
-		Orm *gorm.DB
+
+		Orm      *gorm.DB
+		Keyword  string
+		OrderBy  string
+		PageNum  int
+		PageSize int
 	}
 )
 
@@ -55,12 +60,15 @@
 	return "sale_chance"
 }
 
-func NewSaleChangeSearch() *SaleChangeSearch {
-	return &SaleChangeSearch{Orm: mysqlx.GetDB()}
+func NewSaleChanceSearch() *SaleChanceSearch {
+	return &SaleChanceSearch{Orm: mysqlx.GetDB()}
 }
 
-func (slf *SaleChangeSearch) build() *gorm.DB {
+func (slf *SaleChanceSearch) build() *gorm.DB {
 	var db = slf.Orm.Model(&SaleChance{})
+	if slf.Keyword != "" {
+		db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+	}
 	if slf.Id > 0 {
 		db = db.Where("id = ?", slf.Id)
 	}
@@ -71,42 +79,66 @@
 	return db
 }
 
-func (slf *SaleChangeSearch) Create(record *SaleChance) (err error) {
+func (slf *SaleChanceSearch) Create(record *SaleChance) (err error) {
 	var db = slf.build()
 	err = db.Create(record).Error
 	return
 }
 
-func (slf *SaleChangeSearch) Update(record *SaleChance) (err error) {
+func (slf *SaleChanceSearch) Update(record *SaleChance) (err error) {
 	var db = slf.build()
 	err = db.Updates(record).Error
 	return
 }
 
-func (slf *SaleChangeSearch) Delete() (err error) {
+func (slf *SaleChanceSearch) Delete() (err error) {
 	var db = slf.build()
 	err = db.Delete(&SaleChance{}).Error
 	return
 }
 
-func (slf *SaleChangeSearch) Find() (record SaleChance, err error) {
+func (slf *SaleChanceSearch) Find() (record SaleChance, err error) {
 	var db = slf.build()
 	err = db.First(&record).Error
 	return
 }
 
-func (slf *SaleChangeSearch) FindAll() (record []*SaleChance, err error) {
+func (slf *SaleChanceSearch) FindAll() ([]*SaleChance, int64, error) {
 	var db = slf.build()
-	err = db.Preload("Client").Preload("Contact").Find(&record).Error
-	return
+	var records = make([]*SaleChance, 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("Client").Preload("Contact").Find(&records).Error
+	return records, total, err
 }
 
-func (slf *SaleChangeSearch) SetId(id int) *SaleChangeSearch {
+func (slf *SaleChanceSearch) SetId(id int) *SaleChanceSearch {
 	slf.Id = id
 	return slf
 }
 
-func (slf *SaleChangeSearch) SetName(name string) *SaleChangeSearch {
+func (slf *SaleChanceSearch) SetName(name string) *SaleChanceSearch {
 	slf.Name = name
 	return slf
 }
+
+func (slf *SaleChanceSearch) SetKeyword(keyword string) *SaleChanceSearch {
+	slf.Keyword = keyword
+	return slf
+}
+
+func (slf *SaleChanceSearch) SetPage(page, size int) *SaleChanceSearch {
+	slf.PageNum, slf.PageSize = page, size
+	return slf
+}
+
+func (slf *SaleChanceSearch) SetOrder(order string) *SaleChanceSearch {
+	slf.OrderBy = order
+	return slf
+}
\ No newline at end of file

--
Gitblit v1.8.0