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/plan.go | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/model/plan.go b/model/plan.go
index d6d0ae5..a8ccdda 100644
--- a/model/plan.go
+++ b/model/plan.go
@@ -25,7 +25,12 @@
PlanSearch struct {
Plan
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -41,6 +46,9 @@
func (slf *PlanSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Plan{})
+ if slf.Keyword != "" {
+ db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+ }
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
}
@@ -70,14 +78,37 @@
return record, err
}
-func (slf *PlanSearch) FindAll() ([]*Plan, error) {
+func (slf *PlanSearch) FindAll() ([]*Plan, int64, error) {
var db = slf.build()
- var record = make([]*Plan, 0)
- err := db.Find(&record).Error
- return record, err
+ var records = make([]*Plan, 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.Find(&records).Error
+ return records, total, err
}
func (slf *PlanSearch) SetId(id int) *PlanSearch {
slf.Id = id
return slf
}
+
+func (slf *PlanSearch) SetKeyword(keyword string) *PlanSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *PlanSearch) SetPage(page, size int) *PlanSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *PlanSearch) SetOrder(order string) *PlanSearch {
+ slf.OrderBy = order
+ return slf
+}
\ No newline at end of file
--
Gitblit v1.8.0