From 5036de7ca06a7a04a45642b80db644a55062cd68 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 11 十月 2023 14:10:39 +0800
Subject: [PATCH] debug

---
 model/process_model.go |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/model/process_model.go b/model/process_model.go
index b0d4afb..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 (
@@ -26,11 +26,12 @@
 
 	ProcessModelSearch struct {
 		ProcessModel
-		Order      string
-		PageNum    int
-		PageSize   int
-		Orm        *gorm.DB
-		Procedures []string
+		Order         string
+		Limit         int
+		Offset        int
+		Orm           *gorm.DB
+		Procedures    []string
+		CurrentNumber string
 	}
 )
 
@@ -56,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
 }
 
@@ -73,6 +74,11 @@
 
 func (slf *ProcessModelSearch) SetNumber(number string) *ProcessModelSearch {
 	slf.Number = number
+	return slf
+}
+
+func (slf *ProcessModelSearch) SetCurrentNumber(number string) *ProcessModelSearch {
+	slf.CurrentNumber = number
 	return slf
 }
 
@@ -112,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 {
@@ -125,6 +131,10 @@
 
 	if slf.IsNew {
 		db = db.Where("is_new = ?", 1)
+	}
+
+	if len(slf.CurrentNumber) != 0 {
+		db = db.Where("number != ?", slf.CurrentNumber)
 	}
 
 	return db
@@ -208,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)
@@ -224,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)
@@ -245,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)
@@ -262,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