From f874e81b77282079398c22c67af754a23d260c91 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期四, 25 七月 2024 11:42:01 +0800
Subject: [PATCH] 添加字段，工种添加工种编码，用于计算工资（id无法固定工种信息）
---
controllers/yield_register_controller.go | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/controllers/yield_register_controller.go b/controllers/yield_register_controller.go
index 1b26acb..8eca9d8 100644
--- a/controllers/yield_register_controller.go
+++ b/controllers/yield_register_controller.go
@@ -70,6 +70,11 @@
}
} else {
//淇濆瓨
+ count, _ := models.NewYieldRegisterSearch().SetNumber(yield.Number).Count()
+ if count > 0 {
+ util.ResponseFormat(c, code.RequestParamError, "缂栫爜宸插瓨鍦�")
+ return
+ }
err = models.NewYieldRegisterSearch().Create(&yield)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "淇濆瓨澶辫触")
@@ -108,7 +113,9 @@
for _, dict := range all {
if register.MarketId == dict.ID {
register.MarketName = dict.Name
- break
+ }
+ if register.WorkshopNumber == dict.Number {
+ register.WorkshopName = dict.Name
}
}
}
@@ -203,7 +210,7 @@
return
}
first, err := models.NewYieldRegisterSearch().SetGroupNumber(params.GroupNumber).SetCreateTime(params.CreateTime).
- SetMarketId(params.MarketId).SetWorkshopId(params.WorkshopId).SetSpec(params.Spec).SetPreload(true).First()
+ SetMarketId(params.MarketId).SetWorkshopNumber(params.WorkshopNumber).SetSpec(params.Spec).SetPreload(true).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
return
--
Gitblit v1.8.0