From 53d80c839ad2aad0a0482ca43fca1fc3a95b9d1c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 03 十一月 2023 17:30:54 +0800
Subject: [PATCH] 更改路由
---
api/v1/process_model.go | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 5e3710d..baa40f3 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -24,23 +24,26 @@
if !ok {
return
}
-
- if params.Page == 1 {
- params.PageSize--
+ procedure, code := service.NewTaskService().GetProcedureById(params.ProcedureId)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
}
- list, total, err := service.GetProcessModelList(params.Page, params.PageSize, params.Number)
+ oldProcessModel, _ := service.GetProcessModelByNumber(procedure.ProcessModelNumber)
+ offset, limit, push := GetOffsetAndLimit(oldProcessModel, params.Page, params.PageSize)
+ list, total, err := service.GetProcessModelList(offset, limit, procedure.ProcessModelNumber)
if err != nil {
ctx.Fail(ecode.DBErr)
return
}
- oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
- if params.Page == 1 {
+
+ 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
+ processModel.IsUpdate = processModel.Number != procedure.ProcessModelNumber
}
if processModel.IsUpdate {
processModel.NewNumber, processModel.NewParamsMap = processModel.Number, processModel.ParamsMap
@@ -49,3 +52,16 @@
}
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