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/contract.go | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/model/contract.go b/model/contract.go
index 4ba79f6..024cf8b 100644
--- a/model/contract.go
+++ b/model/contract.go
@@ -74,11 +74,23 @@
return record, err
}
-func (slf *ContractSearch) FindAll() ([]*Contract, error) {
+func (slf *ContractSearch) FindAll() ([]*Contract, int64, error) {
var db = slf.build()
var records = make([]*Contract, 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("Quotation").Find(&records).Error
- return records, err
+ return records, total, err
}
func (slf *ContractSearch) SetId(id int) *ContractSearch {
@@ -99,4 +111,4 @@
func (slf *ContractSearch) SetOrder(order string) *ContractSearch {
slf.OrderBy = order
return slf
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0