From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
api/v1/process_model.go | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 06c1711..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"
@@ -15,7 +16,7 @@
// @Summary 鑾峰彇宸ヨ壓妯″瀷鍒楄〃
// @Produce application/json
// @Param object query request.ProcessModelList true "鏌ヨ鍙傛暟"
-// @Success 200 {object} contextx.Response{data=response.TaskCountdown} "鎴愬姛"
+// @Success 200 {object} contextx.Response{data=[]model.ProcessModel} "鎴愬姛"
// @Router /v1/processModel/list [get]
func (slf *ProcessModelApi) List(c *gin.Context) {
var params request.ProcessModelList
@@ -23,28 +24,38 @@
if !ok {
return
}
- procedure, code := service.NewTaskService().GetProcedureById(params.ProcedureId)
- if code != ecode.OK {
- ctx.Fail(code)
- return
- }
-
- order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ 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
}
- list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
- if err != nil {
- ctx.Fail(ecode.DBErr)
- return
+ if push { //绮樺湪鍓嶉潰
+ list = append([]*model.ProcessModel{oldProcessModel}, list...)
}
for _, processModel := range list {
- if processModel.Procedure == procedure.ProceduresInfo.ProcedureName && processModel.Product == order.ProductName {
+ 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