From cdb47d41f39a5c600caa41692c9b5b0732944d6a Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 08 八月 2023 11:38:27 +0800
Subject: [PATCH] fix
---
model/plan.go | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/model/plan.go b/model/plan.go
index 3046ef9..a8ccdda 100644
--- a/model/plan.go
+++ b/model/plan.go
@@ -20,11 +20,17 @@
EndTime time.Time `json:"endTime" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
Content string `json:"content" gorm:"column:content;type:varchar(255);comment:璁″垝鍐呭"`
File string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
+ gorm.Model `json:"-"`
}
PlanSearch struct {
Plan
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -40,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)
}
@@ -69,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