From cc7c2094568ea8f9d1697da5ed0a2c759ca81abd Mon Sep 17 00:00:00 2001 From: yinbentan <yinbentan@live.com> Date: 星期五, 30 八月 2024 17:18:30 +0800 Subject: [PATCH] 方法修改,修改薪资列表,添加分页查询 --- controllers/request/yield_register_request.go | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/controllers/request/yield_register_request.go b/controllers/request/yield_register_request.go index 5da71e9..786e8cf 100644 --- a/controllers/request/yield_register_request.go +++ b/controllers/request/yield_register_request.go @@ -13,7 +13,8 @@ Number string `json:"number"` //缂栧彿 CreateTime string `json:"createTime"` //鍒涘缓鏃堕棿 MarketId uint `json:"marketId"` //搴勫彛id - WorkshopId uint `json:"workshopId"` //杞﹂棿id + MarketNumber string `json:"marketNumber"` //搴勫彛缂栧彿 + WorkshopNumber string `json:"workshopNumber"` //杞﹂棿缂栫爜 GroupNumber int `json:"groupNumber"` //缁勫埆 Spec string `json:"spec"` //瑙勬牸 JieZhuang string `json:"jieZhuang"` //鏄惁缁撳簞 @@ -29,6 +30,9 @@ FallingSilkBucketOne decimal.Decimal `json:"fallingSilkBucketOne"` //钀戒笣妗舵暟1 FallingSilkBucketTwo decimal.Decimal `json:"fallingSilkBucketTwo"` //钀戒笣妗舵暟2 FallingSilkBucketThree decimal.Decimal `json:"fallingSilkBucketThree"` //钀戒笣妗舵暟3 + SelectOne bool `json:"selectOne"` //钀戒笣妗舵暟1閫変腑 + SelectTwo bool `json:"selectTwo"` //钀戒笣妗舵暟2閫変腑 + SelectThree bool `json:"selectThree"` //钀戒笣妗舵暟3閫変腑 TheorySilkAmount decimal.Decimal `json:"theorySilkAmount"` //鐞嗚涓濋噺 HourYield decimal.Decimal `json:"hourYield"` //鍙版椂浜ч噺 OneBack string `json:"oneBack"` //绗竴鍥� @@ -64,9 +68,9 @@ } type ChangeYieldRegister struct { - CreateTime string `json:"createTime"` //鍒涘缓鏃堕棿 - MarketId uint `json:"marketId"` //搴勫彛id - WorkshopId uint `json:"workshopId"` //杞﹂棿id - GroupNumber int `json:"groupNumber"` //缁勫埆 - Spec string `json:"spec"` //瑙勬牸 + CreateTime string `json:"createTime"` //鍒涘缓鏃堕棿 + MarketId uint `json:"marketId"` //搴勫彛id + WorkshopNumber string `json:"workshopNumber"` //杞﹂棿缂栫爜 + GroupNumber int `json:"groupNumber"` //缁勫埆 + Spec string `json:"spec"` //瑙勬牸 } -- Gitblit v1.8.0