From 1c67212ae8815d9cf1fe999088aeb8b96e5d88e3 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期五, 12 四月 2024 15:08:44 +0800 Subject: [PATCH] 产量登记表修改 --- docs/swagger.yaml | 2 +- controllers/yield_register_controller.go | 33 ++++++++++++++++++++++++++++++--- docs/docs.go | 2 +- docs/swagger.json | 2 +- models/raw_silk_price_standard.go | 2 +- 5 files changed, 34 insertions(+), 7 deletions(-) diff --git a/controllers/yield_register_controller.go b/controllers/yield_register_controller.go index a5412f6..1b26acb 100644 --- a/controllers/yield_register_controller.go +++ b/controllers/yield_register_controller.go @@ -38,7 +38,7 @@ circles := make([]*models.YieldRegisterCircle, 0) for _, circle := range yield.Circles { for _, circleInfo := range params.Circles { - if circle.CarNumber == circleInfo.CarNumber { + if circle.CarNumber == circleInfo.CarNumber && circle.Circle == circleInfo.Circle { for _, number := range circleInfo.PieceNumbers { data := *circle data.PieceNumber = number.PieceNumber @@ -121,7 +121,7 @@ // @Summary 鑾峰彇浜ч噺鐧昏琛ㄨ鎯� // @Produce application/json // @Param object body request.GetYieldRegisterList true "鍙傛暟" -// @Success 200 {object} util.Response{data=models.YieldRegister} "鎴愬姛" +// @Success 200 {object} util.Response{data=request.YieldRegisterInfo} "鎴愬姛" // @Router /api-jl/v1/fineness/getYieldRegisterInfo [post] func (slf YieldRegisterController) GetYieldRegisterInfo(c *gin.Context) { var params request.GetYieldRegisterList @@ -135,7 +135,34 @@ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触") return } - util.ResponseFormat(c, code.Success, register) + var data request.YieldRegisterInfo + err = structx.AssignTo(register, &data) + if err != nil { + util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲澶辫触") + return + } + circleInfos := make([]request.YieldRegisterCircleInfo, 0) + flagMap := make(map[int]bool) + for _, circle := range data.Circles { + //闃叉閲嶅 + num := circle.CarNumber*10000 + circle.Circle*100 + if flagMap[num] { + continue + } + ci := circle + for _, registerCircle := range register.Circles { + if circle.CarNumber == registerCircle.CarNumber && circle.Circle == registerCircle.Circle { + var pi request.PieceInfo + pi.PieceNumber = registerCircle.PieceNumber + pi.Value = registerCircle.Value + ci.PieceNumbers = append(ci.PieceNumbers, pi) + } + } + flagMap[num] = true + circleInfos = append(circleInfos, ci) + } + data.Circles = circleInfos + util.ResponseFormat(c, code.Success, data) } // DeleteYieldRegister diff --git a/docs/docs.go b/docs/docs.go index 11a91f9..77bc7c2 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -265,7 +265,7 @@ "type": "object", "properties": { "data": { - "$ref": "#/definitions/models.YieldRegister" + "$ref": "#/definitions/request.YieldRegisterInfo" } } } diff --git a/docs/swagger.json b/docs/swagger.json index 331e1b8..95ce659 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -253,7 +253,7 @@ "type": "object", "properties": { "data": { - "$ref": "#/definitions/models.YieldRegister" + "$ref": "#/definitions/request.YieldRegisterInfo" } } } diff --git a/docs/swagger.yaml b/docs/swagger.yaml index d933c43..ac8304c 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -994,7 +994,7 @@ - $ref: '#/definitions/util.Response' - properties: data: - $ref: '#/definitions/models.YieldRegister' + $ref: '#/definitions/request.YieldRegisterInfo' type: object summary: 鑾峰彇浜ч噺鐧昏琛ㄨ鎯� tags: diff --git a/models/raw_silk_price_standard.go b/models/raw_silk_price_standard.go index ac84ba4..2395f37 100644 --- a/models/raw_silk_price_standard.go +++ b/models/raw_silk_price_standard.go @@ -88,7 +88,7 @@ if slf.PageNum*slf.PageSize > 0 { db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize) } - if err := db.Find(&records).Error; err != nil { + if err := db.Order("updated_at desc").Find(&records).Error; err != nil { return records, total, fmt.Errorf("find records err: %v", err) } -- Gitblit v1.8.0