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/followRecord.go | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/model/followRecord.go b/model/followRecord.go
index 29123cd..5a2ab82 100644
--- a/model/followRecord.go
+++ b/model/followRecord.go
@@ -30,7 +30,12 @@
FollowRecordSearch struct {
FollowRecord
- Orm *gorm.DB
+
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -46,6 +51,12 @@
func (slf *FollowRecordSearch) build() *gorm.DB {
var db = slf.Orm.Model(&FollowRecord{})
+ if slf.Keyword != "" {
+ db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+ }
+ if slf.Keyword != "" {
+ db = db.Where("topic LIKE ?", "%"+slf.Keyword+"%")
+ }
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
}
@@ -101,10 +112,19 @@
return record, err
}
-func (slf *FollowRecordSearch) Find() ([]*FollowRecord, error) {
+func (slf *FollowRecordSearch) FindAll() ([]*FollowRecord, int64, error) {
+ var db = slf.build()
var records = make([]*FollowRecord, 0)
- err := slf.build().Preload("Client").Preload("Contact").Find(&records).Error
- return records, err
+ 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 *FollowRecordSearch) Count() (int64, error) {
@@ -148,3 +168,18 @@
slf.ClientId = clientId
return slf
}
+
+func (slf *FollowRecordSearch) SetKeyword(keyword string) *FollowRecordSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *FollowRecordSearch) SetPage(page, size int) *FollowRecordSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *FollowRecordSearch) SetOrder(order string) *FollowRecordSearch {
+ slf.OrderBy = order
+ return slf
+}
--
Gitblit v1.8.0