字段修改

liujiandao

2024-04-10 bedfbcbe3af9635d15d0cafece60fbd311159fe5

字段修改

 controllers/yield_register_controller.go

@@ -3,6 +3,7 @@
import (
    "github.com/gin-gonic/gin"
    "gorm.io/gorm"
    "silkserver/constvar"
    "silkserver/controllers/request"
    "silkserver/extend/code"
    "silkserver/extend/util"
@@ -84,6 +85,19 @@
        util.ResponseFormat(c, code.RequestParamError, "查询失败")
        return
    }
    all, err := models.NewDictSearch().SetDictTypes([]constvar.DictType{constvar.DictTypeMarket, constvar.DictTypeWorkshop}).FindAll()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查询失败")
        return
    }
    for _, register := range list {
        for _, dict := range all {
            if register.MarketId == dict.ID {
                register.MarketName = dict.Name
                break
            }
        }
    }
    util.ResponseFormatList(c, code.Success, list, total)
}


 docs/docs.go

@@ -1307,7 +1307,10 @@
                "id": {
                    "type": "integer"
                },
                "marketNumber": {
                "marketId": {
                    "type": "integer"
                },
                "marketName": {
                    "type": "string"
                },
                "notes": {
@@ -1425,6 +1428,10 @@
                "marketId": {
                    "type": "integer"
                },
                "marketName": {
                    "description": "庄口名",
                    "type": "string"
                },
                "number": {
                    "type": "string"
                },
@@ -1463,6 +1470,10 @@
                },
                "workshopId": {
                    "type": "integer"
                },
                "workshopName": {
                    "description": "车间名",
                    "type": "string"
                }
            }
        },

 docs/swagger.json

@@ -1295,7 +1295,10 @@
                "id": {
                    "type": "integer"
                },
                "marketNumber": {
                "marketId": {
                    "type": "integer"
                },
                "marketName": {
                    "type": "string"
                },
                "notes": {
@@ -1413,6 +1416,10 @@
                "marketId": {
                    "type": "integer"
                },
                "marketName": {
                    "description": "庄口名",
                    "type": "string"
                },
                "number": {
                    "type": "string"
                },
@@ -1451,6 +1458,10 @@
                },
                "workshopId": {
                    "type": "integer"
                },
                "workshopName": {
                    "description": "车间名",
                    "type": "string"
                }
            }
        },

 docs/swagger.yaml

@@ -267,7 +267,9 @@
        $ref: '#/definitions/gorm.DeletedAt'
      id:
        type: integer
      marketNumber:
      marketId:
        type: integer
      marketName:
        type: string
      notes:
        type: string
@@ -345,6 +347,9 @@
        type: string
      marketId:
        type: integer
      marketName:
        description: 庄口名
        type: string
      number:
        type: string
      oneBack:
@@ -371,6 +376,9 @@
        type: number
      workshopId:
        type: integer
      workshopName:
        description: 车间名
        type: string
    type: object
  models.YieldRegisterCircle:
    properties:

 models/dict.go

@@ -19,11 +19,12 @@

    DictSearch struct {
        Dict
        Order    string
        PageNum  int
        PageSize int
        Orm      *gorm.DB
        Keyword  string
        Order     string
        PageNum   int
        PageSize  int
        Orm       *gorm.DB
        Keyword   string
        DictTypes []constvar.DictType
    }
)

@@ -75,6 +76,11 @@
    return slf
}

func (slf *DictSearch) SetDictTypes(dts []constvar.DictType) *DictSearch {
    slf.DictTypes = dts
    return slf
}

func (slf *DictSearch) build() *gorm.DB {
    var db = slf.Orm.Table(slf.TableName())

@@ -103,6 +109,10 @@
        db = db.Where("name like ? or number like ?", kw, kw)
    }

    if len(slf.DictTypes) > 0 {
        db = db.Where("dict_type in (?)", slf.DictTypes)
    }

    return db
}


 models/raw_silk_price_standard.go

@@ -11,7 +11,8 @@
type (
    RawSilkPriceStandard struct {
        gorm.Model
        MarketNumber string          `json:"marketNumber" gorm:"type:varchar(255);comment:庄口编号"`
        MarketId     uint            `json:"marketId" gorm:"type:int(11);comment:庄口id"`
        MarketName   string          `json:"marketName" gorm:"type:varchar(255);comment:庄口名称"`
        RawSilkGrade string          `json:"rawSilkGrade" gorm:"type:varchar(255);comment:生丝等级"`
        PayStandard  decimal.Decimal `json:"payStandard" gorm:"type:decimal(20,3);comment:薪酬标准"`
        Unit         string          `json:"unit" gorm:"type:varchar(100);comment:单位"`

 models/yield_register.go

@@ -38,6 +38,10 @@
        Total                   decimal.Decimal        `json:"total" gorm:"type:decimal(12,2);comment:总产量"`
        Items                   []*YieldRegisterItem   `json:"items" gorm:"foreignKey:YieldRegisterId"`
        Circles                 []*YieldRegisterCircle `json:"circles" gorm:"foreignKey:YieldRegisterId"`

        MarketName   string `json:"marketName" gorm:"-"`   //庄口名
        WorkshopName string `json:"workshopName" gorm:"-"` //车间名

    }
    YieldRegisterSearch struct {
        YieldRegister