From dad1ae79fe78e770d88f41713b4c68fad562d9ef Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 21:36:34 +0800
Subject: [PATCH] 当前使用的工艺编号置顶
---
service/process_model.go | 4 ++--
model/process_model.go | 24 ++++++++++++------------
api/v1/process_model.go | 25 ++++++++++++++++---------
3 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 61dad3b..8a03909 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -24,20 +24,15 @@
if !ok {
return
}
-
oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
-
- if params.Page == 1 && oldProcessModel.IsNew { //灏戞煡涓�涓�
- params.PageSize--
- }
-
- list, total, err := service.GetProcessModelList(params.Page, params.PageSize, params.Number)
+ offset, limit, push := GetOffsetAndLimit(oldProcessModel, params.Page, params.PageSize)
+ list, total, err := service.GetProcessModelList(offset, limit, params.Number)
if err != nil {
ctx.Fail(ecode.DBErr)
return
}
- if params.Page == 1 && oldProcessModel.IsNew { //绮樺湪鍓嶉潰
+ if push { //绮樺湪鍓嶉潰
list = append([]*model.ProcessModel{oldProcessModel}, list...)
}
for _, processModel := range list {
@@ -49,6 +44,18 @@
processModel.Number, processModel.ParamsMap = oldProcessModel.Number, oldProcessModel.ParamsMap
}
}
-
ctx.ResultList(list, total)
}
+
+func GetOffsetAndLimit(current *model.ProcessModel, page, pageSize int) (offset, limit int, push bool) {
+ offset = (page - 1) * pageSize
+ if current.IsNew {
+ offset--
+ }
+ push = current.IsNew && page == 1
+ limit = pageSize
+ if push {
+ limit--
+ }
+ return offset, limit, push
+}
diff --git a/model/process_model.go b/model/process_model.go
index 56ab7be..a08e694 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -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
}
@@ -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)
diff --git a/service/process_model.go b/service/process_model.go
index adf53ba..bb42646 100644
--- a/service/process_model.go
+++ b/service/process_model.go
@@ -5,14 +5,14 @@
"apsClient/model"
)
-func GetProcessModelList(page, pageSize int, currentNumber string) (list []*model.ProcessModel, total int64, err error) {
+func GetProcessModelList(offset, limit int, currentNumber string) (list []*model.ProcessModel, total int64, err error) {
device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.System.DeviceId).First()
if err != nil {
return
}
list, total, err = model.NewProcessModelSearch().
SetIsNew(true).SetOrder("id desc").SetCurrentNumber(currentNumber).
- SetPage(page, pageSize).SetProcedures(device.ProceduresArr).Find()
+ SetPage(offset, limit).SetProcedures(device.ProceduresArr).Find()
return
}
--
Gitblit v1.8.0