From 91487fbd678ed772c5aa5b4e250f6f6e9616f219 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 14 十一月 2023 14:54:18 +0800
Subject: [PATCH] fixt
---
api/v1/process_model.go | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 06c1711..5a8e8f6 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,57 @@
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)
if err != nil {
ctx.Fail(ecode.DBErr)
return
}
+ var oldProcessModel, newProcessModel, headProcessModel *model.ProcessModel
+ if procedure.ProcessModelNumber != "" {
+ oldProcessModel, _ = service.GetProcessModelByNumber(procedure.ProcessModelNumber) //鑾峰彇鏃х殑宸ヨ壓鍙傛暟
+ newProcessModel, _ = service.NewTaskService().GetProcessParams(procedure, order) //鑾峰彇鏂扮殑宸ヨ壓鍙傛暟
+ if newProcessModel != nil && (oldProcessModel == nil || newProcessModel.Number != oldProcessModel.Number) { //鏃х殑娌℃湁鎴栬�呯紪鍙蜂笉鍚岋紝鏇存柊
+ newProcessModel.NewNumber, newProcessModel.NewParamsMap = newProcessModel.Number, newProcessModel.ParamsMap
+ if oldProcessModel != nil {
+ newProcessModel.Number, newProcessModel.ParamsMap = oldProcessModel.Number, oldProcessModel.ParamsMap
+ } else { //鏃х殑娌℃湁锛屼篃鍙互"鏇存柊"(琛ュ厖)
+ newProcessModel.Number, newProcessModel.ParamsMap = "", nil
+ }
+ headProcessModel = newProcessModel
+ } else if oldProcessModel != nil {
+ headProcessModel = oldProcessModel
+ }
+ }
- list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
+ offset, limit, unShift := GetOffsetAndLimit(headProcessModel, params.Page, params.PageSize)
+ list, total, err := service.GetOtherProcessModelList(offset, limit, order.ProductName, procedure.ProceduresInfo.ProcedureName) //鑾峰彇鍏朵粬宸ヨ壓鍙傛暟
if err != nil {
ctx.Fail(ecode.DBErr)
return
}
- for _, processModel := range list {
- if processModel.Procedure == procedure.ProceduresInfo.ProcedureName && processModel.Product == order.ProductName {
- processModel.IsUpdate = processModel.Number != params.Number
- }
+ if unShift && headProcessModel != nil { //绮樺湪鍓嶉潰
+ list = append([]*model.ProcessModel{headProcessModel}, list...)
+ }
+ ctx.ResultList(list, total)
+}
+
+func GetOffsetAndLimit(head *model.ProcessModel, page, pageSize int) (offset, limit int, unShift bool) {
+ //isNew鏄鏇存柊鐨�
+ unShift = head != nil && page == 1
+ limit = pageSize
+ if unShift {
+ limit-- //濡傛灉鏄柊鐨勶紝绗竴椤靛皯鏌ヤ竴涓�
+ }
+ offset = (page - 1) * pageSize
+ if head != nil && offset > 0 { //濡傛灉鏄柊鐨勶紝绗簩椤靛紑濮嬪亸绉婚噺宸︾Щ涓�涓�
+ offset--
}
- ctx.ResultList(list, total)
+ return offset, limit, unShift
}
--
Gitblit v1.8.0