From ff3e203423f296965472d1f09347cda5cfe3a786 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 11 八月 2023 11:37:19 +0800 Subject: [PATCH] update --- model/masterOrder.go | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/model/masterOrder.go b/model/masterOrder.go index 6d52417..71f053e 100644 --- a/model/masterOrder.go +++ b/model/masterOrder.go @@ -23,7 +23,13 @@ // MasterOrderSearch 閿�鍞�诲崟鎼滅储鏉′欢 MasterOrderSearch struct { MasterOrder - Orm *gorm.DB + + Orm *gorm.DB + Keyword string + OrderBy string + PageNum int + PageSize int + } ) @@ -39,6 +45,9 @@ func (slf *MasterOrderSearch) build() *gorm.DB { var db = slf.Orm.Model(&MasterOrder{}) + if slf.Keyword != "" { + db = db.Where("name LIKE ?", "%"+slf.Keyword+"%") + } if slf.Id != 0 { db = db.Where("id = ?", slf.Id) } @@ -68,14 +77,41 @@ return record, err } -func (slf *MasterOrderSearch) FindAll() ([]*MasterOrder, error) { +func (slf *MasterOrderSearch) FindAll() ([]*MasterOrder, int64, error) { var db = slf.build() var records = make([]*MasterOrder, 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("Client").Find(&records).Error - return records, err + return records, total, err } func (slf *MasterOrderSearch) SetId(id int) *MasterOrderSearch { slf.Id = id return slf } + +func (slf *MasterOrderSearch) SetKeyword(keyword string) *MasterOrderSearch { + slf.Keyword = keyword + return slf +} + +func (slf *MasterOrderSearch) SetPage(page, size int) *MasterOrderSearch { + slf.PageNum, slf.PageSize = page, size + return slf +} + +func (slf *MasterOrderSearch) SetOrder(order string) *MasterOrderSearch { + slf.OrderBy = order + return slf +} \ No newline at end of file -- Gitblit v1.8.0