From 468ceb8a9bfe9e15e3be470b23809dde83a11f0d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 19:14:53 +0800
Subject: [PATCH] merge master
---
api/v1/process_model.go | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 06c1711..64becd0 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -15,23 +15,12 @@
// @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
ctx, ok := contextx.NewContext(c, ¶ms)
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
}
@@ -40,10 +29,16 @@
ctx.Fail(ecode.DBErr)
return
}
+ oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
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)
--
Gitblit v1.8.0