From 5e4d9f05035d1153ab191dd1cb0a4922b91983b2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 11 十月 2023 14:36:37 +0800
Subject: [PATCH] debug
---
model/process_model.go | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/model/process_model.go b/model/process_model.go
index 56ab7be..1ab13a2 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -5,7 +5,7 @@
"apsClient/pkg/sqlitex"
"encoding/json"
"fmt"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
)
type (
@@ -27,8 +27,8 @@
ProcessModelSearch struct {
ProcessModel
Order string
- PageNum int
- PageSize int
+ Limit int
+ Offset int
Orm *gorm.DB
Procedures []string
CurrentNumber string
@@ -57,8 +57,8 @@
return slf
}
-func (slf *ProcessModelSearch) SetPage(page, size int) *ProcessModelSearch {
- slf.PageNum, slf.PageSize = page, size
+func (slf *ProcessModelSearch) SetPage(offset, limit int) *ProcessModelSearch {
+ slf.Offset, slf.Limit = offset, limit
return slf
}
@@ -118,7 +118,7 @@
}
if len(slf.Procedures) != 0 {
- db = db.Where("`procedure` in ?", slf.Procedures)
+ db = db.Where("`procedure` IN (?)", slf.Procedures)
}
if len(slf.Number) != 0 {
@@ -218,8 +218,8 @@
if err := db.Count(&total).Error; err != nil {
return records, total, fmt.Errorf("find count err: %v", err)
}
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ if slf.Offset > 0 || slf.Limit > 0 {
+ db = db.Offset(slf.Offset).Limit(slf.Limit)
}
if err := db.Find(&records).Error; err != nil {
return records, total, fmt.Errorf("find records err: %v", err)
@@ -234,8 +234,8 @@
db = slf.build()
)
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ if slf.Offset > 0 || slf.Limit > 0 {
+ db = db.Offset(slf.Offset).Limit(slf.Limit)
}
if err := db.Find(&records).Error; err != nil {
return records, fmt.Errorf("find records err: %v", err)
@@ -255,8 +255,8 @@
if err := db.Count(&total).Error; err != nil {
return records, total, fmt.Errorf("find by query count err: %v", err)
}
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ if slf.Offset > 0 || slf.Limit > 0 {
+ db = db.Offset(slf.Offset).Limit(slf.Limit)
}
if err := db.Find(&records).Error; err != nil {
return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
@@ -272,8 +272,8 @@
db = slf.Orm.Table(slf.TableName()).Where(query, args...)
)
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ if slf.Offset > 0 || slf.Limit > 0 {
+ db = db.Offset(slf.Offset).Limit(slf.Limit)
}
if err := db.Find(&records).Error; err != nil {
return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
--
Gitblit v1.8.0