From 000d7434525d4b7743e4b8e1f6b2a6aa5357bf12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 四月 2024 15:11:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer
---
controllers/yield_register_controller.go | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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
--
Gitblit v1.8.0