fix

zhangqian

2023-08-15 0e8be85f382fbad5b003f6f86768ef799e2c027d

fix

 api/v1/serviceContract.go

@@ -98,27 +98,6 @@
    ctx.Ok()
}

// check params
func checkServiceContractParams(serviceContract request.ServiceContract) (errCode int, result model.ServiceContract) {
    result.Number = serviceContract.Number
    result.MemberId = serviceContract.MemberId
    result.Remark = serviceContract.Remark
    result.ClientId = serviceContract.ClientId
    result.SalesDetailsId = serviceContract.SalesDetailsId
    result.SaleChanceId = serviceContract.SaleChanceId
    result.QuotationId = serviceContract.QuotationId
    result.ServiceContractTypeId = serviceContract.TypeId
    result.ServiceContractStatusId = serviceContract.StatusId
    result.ServiceTimes = serviceContract.ServiceTimes
    result.Terms = serviceContract.Terms
    result.Products = serviceContract.Products
    result.SignTime = serviceContract.SignTime
    result.StartTime = serviceContract.StartTime
    result.EndTime = serviceContract.EndTime

    return ecode.OK, result
}

// List
//
// @Tags   ServiceContract

 docs/docs.go

@@ -11968,6 +11968,9 @@
                "id": {
                    "type": "integer"
                },
                "member": {
                    "$ref": "#/definitions/model.User"
                },
                "member_id": {
                    "type": "integer"
                },
@@ -12301,6 +12304,9 @@
                "id": {
                    "type": "integer"
                },
                "member": {
                    "$ref": "#/definitions/model.User"
                },
                "memberId": {
                    "type": "integer"
                },

 docs/swagger.json

@@ -11956,6 +11956,9 @@
                "id": {
                    "type": "integer"
                },
                "member": {
                    "$ref": "#/definitions/model.User"
                },
                "member_id": {
                    "type": "integer"
                },
@@ -12289,6 +12292,9 @@
                "id": {
                    "type": "integer"
                },
                "member": {
                    "$ref": "#/definitions/model.User"
                },
                "memberId": {
                    "type": "integer"
                },

 docs/swagger.yaml

@@ -1381,6 +1381,8 @@
        type: array
      id:
        type: integer
      member:
        $ref: '#/definitions/model.User'
      member_id:
        type: integer
      name:
@@ -1603,6 +1605,8 @@
        type: string
      id:
        type: integer
      member:
        $ref: '#/definitions/model.User'
      memberId:
        type: integer
      number:

 model/serviceContract.go

@@ -17,6 +17,7 @@
        Client                  Client                `json:"client" gorm:"foreignKey:ClientId"`
        Number                  string                `json:"number" gorm:"column:number;type:varchar(255);comment:合同编号"`
        MemberId                int                   `json:"memberId" gorm:"column:member_id;type:int;comment:负责人id"`
        Member                  User                  `json:"member" gorm:"foreignKey:MemberId"`
        ContactId               int                   `json:"contactId" gorm:"column:contact_id;type:int;comment:联系人id"`
        Contact                 Contact               `json:"contact" gorm:"foreignKey:ContactId"`
        SaleChanceId            int                   `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:销售机会id"`
@@ -109,6 +110,9 @@
    }
    if slf.Preload {
        db = db.
            Preload("Client").
            Preload("Member").
            Preload("Contact").
            Preload("SaleChance").
            Preload("SalesDetails").
            Preload("Quotation").