From 3bf242225e26ee3b967461ac43df1eb8e0f6e424 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 14 十一月 2023 13:39:21 +0800
Subject: [PATCH] fix
---
api/v1/process_model.go | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 06c1711..c15b609 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
@@ -28,23 +29,44 @@
ctx.Fail(code)
return
}
+ var oldProcessModel *model.ProcessModel
+ if procedure.ProcessModelNumber != "" {
+ oldProcessModel, _ = service.GetProcessModelByNumber(procedure.ProcessModelNumber)
+ }
- order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ offset, limit, unShift := GetOffsetAndLimit(oldProcessModel, params.Page, params.PageSize)
+ list, total, err := service.GetProcessModelList(offset, limit, procedure.ProcessModelNumber)
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 unShift && oldProcessModel != nil { //绮樺湪鍓嶉潰
+ list = append([]*model.ProcessModel{oldProcessModel}, list...)
}
for _, processModel := range list {
- if processModel.Procedure == procedure.ProceduresInfo.ProcedureName && processModel.Product == order.ProductName {
- processModel.IsUpdate = processModel.Number != params.Number
+ if oldProcessModel != nil && processModel.Procedure == oldProcessModel.Procedure && processModel.Product == oldProcessModel.Product {
+ processModel.IsUpdate = processModel.Number != procedure.ProcessModelNumber
+ }
+ 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, unShift bool) {
+ //isNew鏄鏇存柊鐨�
+ unShift = current != nil && page == 1
+ limit = pageSize
+ if unShift {
+ limit-- //濡傛灉鏄柊鐨勶紝绗竴椤靛皯鏌ヤ竴涓�
+ }
+ offset = (page - 1) * pageSize
+ if current != nil && offset > 0 { //濡傛灉鏄柊鐨勶紝绗簩椤靛紑濮嬪亸绉婚噺宸︾Щ涓�涓�
+ offset--
+ }
+
+ return offset, limit, unShift
+}
--
Gitblit v1.8.0