From b24a62470d1c937dcd033728b05a47ad3e13500d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 05 十二月 2023 10:40:14 +0800
Subject: [PATCH] dashboard字段更新
---
api/v1/process_model.go | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index c20214b..447668c 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,10 +24,60 @@
if !ok {
return
}
- list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
+
+ 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) { //鏃х殑娌℃湁鎴栬�呯紪鍙蜂笉鍚岋紝鏇存柊
+ if procedure.Status == model.ProcedureStatusProcessing {
+ 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
+ }
+ newProcessModel.IsUpdate = true
+ }
+ headProcessModel = newProcessModel
+ } else if oldProcessModel != nil {
+ headProcessModel = oldProcessModel
+ }
+
+ 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
+ }
+ 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) {
+ unShift = head != nil && page == 1
+ limit = pageSize
+ if unShift {
+ limit-- //绗竴椤靛皯鏌ヤ竴涓�
+ }
+ offset = (page - 1) * pageSize
+ if head != nil && offset > 0 { //绗簩椤靛紑濮嬪亸绉婚噺宸︾Щ涓�涓�
+ offset--
+ }
+
+ return offset, limit, unShift
+}
--
Gitblit v1.8.0