From 94139ee1a04839135eb760b431f1212703d6cd86 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 10 十月 2023 10:57:03 +0800
Subject: [PATCH] Merge branch 'master' into feat-serf
---
api/v1/process_model.go | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 64becd0..8a03909 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -1,6 +1,7 @@
package v1
import (
+ "apsClient/model"
"apsClient/model/request"
"apsClient/pkg/contextx"
"apsClient/pkg/ecode"
@@ -23,23 +24,38 @@
if !ok {
return
}
-
- list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
+ oldProcessModel, _ := service.GetProcessModelByNumber(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
}
- oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
+
+ if push { //绮樺湪鍓嶉潰
+ list = append([]*model.ProcessModel{oldProcessModel}, list...)
+ }
for _, processModel := range list {
if processModel.Procedure == oldProcessModel.Procedure && processModel.Product == oldProcessModel.Product {
processModel.IsUpdate = processModel.Number != params.Number
}
if processModel.IsUpdate {
-
processModel.NewNumber, processModel.NewParamsMap = processModel.Number, processModel.ParamsMap
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
+}
--
Gitblit v1.8.0