Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer

zhangqian

2024-04-12 000d7434525d4b7743e4b8e1f6b2a6aa5357bf12

Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer

 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

 docs/docs.go

@@ -265,7 +265,7 @@
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/models.YieldRegister"
                                            "$ref": "#/definitions/request.YieldRegisterInfo"
                                        }
                                    }
                                }

 docs/swagger.json

@@ -253,7 +253,7 @@
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/models.YieldRegister"
                                            "$ref": "#/definitions/request.YieldRegisterInfo"
                                        }
                                    }
                                }

 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:

 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)
    }