From d8ac88cfb72e3aac3a89c3cfe77774be3024a24c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 八月 2023 17:54:43 +0800
Subject: [PATCH] update
---
model/subOrder.go | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/model/subOrder.go b/model/subOrder.go
index f383d9d..42bb6eb 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -20,12 +20,11 @@
SubOrderSearch struct {
SubOrder
- Orm *gorm.DB
+ Orm *gorm.DB
Keyword string
OrderBy string
PageNum int
PageSize int
-
}
)
@@ -72,10 +71,19 @@
return
}
-func (slf *SubOrderSearch) FindAll() (result []*SubOrder, err error) {
+func (slf *SubOrderSearch) FindAll() ([]*SubOrder, int64, error) {
var db = slf.build()
- err = db.Preload("Products").Preload("Client").Find(&result).Error
- return
+ var records = make([]*SubOrder, 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("Products").Preload("Client").Find(&records).Error
+ return records, total, err
}
func (slf *SubOrderSearch) SetId(id int) *SubOrderSearch {
@@ -96,4 +104,4 @@
func (slf *SubOrderSearch) SetOrder(order string) *SubOrderSearch {
slf.OrderBy = order
return slf
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0