fix

wangpengfei

2023-08-15 0ce02d3f2ccd767c50efe5f2e0211ec24f1583b3

fix

add the return parameters to saleChance and salesLeads

 docs/docs.go

@@ -11736,6 +11736,9 @@
                "region_id": {
                    "type": "integer"
                },
                "regular_customers": {
                    "$ref": "#/definitions/model.RegularCustomers"
                },
                "regular_customers_id": {
                    "type": "integer"
                },
@@ -11748,10 +11751,13 @@
                "sale_stage_id": {
                    "type": "integer"
                },
                "sale_type": {
                    "$ref": "#/definitions/model.SaleType"
                },
                "sale_type_id": {
                    "type": "integer"
                },
                "salesSources": {
                "sales_sources": {
                    "$ref": "#/definitions/model.SalesSources"
                },
                "sales_sources_id": {

 docs/swagger.json

@@ -11724,6 +11724,9 @@
                "region_id": {
                    "type": "integer"
                },
                "regular_customers": {
                    "$ref": "#/definitions/model.RegularCustomers"
                },
                "regular_customers_id": {
                    "type": "integer"
                },
@@ -11736,10 +11739,13 @@
                "sale_stage_id": {
                    "type": "integer"
                },
                "sale_type": {
                    "$ref": "#/definitions/model.SaleType"
                },
                "sale_type_id": {
                    "type": "integer"
                },
                "salesSources": {
                "sales_sources": {
                    "$ref": "#/definitions/model.SalesSources"
                },
                "sales_sources_id": {

 docs/swagger.yaml

@@ -1226,6 +1226,8 @@
        $ref: '#/definitions/model.Region'
      region_id:
        type: integer
      regular_customers:
        $ref: '#/definitions/model.RegularCustomers'
      regular_customers_id:
        type: integer
      remark:
@@ -1234,12 +1236,14 @@
        $ref: '#/definitions/model.SaleStage'
      sale_stage_id:
        type: integer
      sale_type:
        $ref: '#/definitions/model.SaleType'
      sale_type_id:
        type: integer
      sales_sources:
        $ref: '#/definitions/model.SalesSources'
      sales_sources_id:
        type: integer
      salesSources:
        $ref: '#/definitions/model.SalesSources'
      solutions:
        type: string
      status_id:

 model/client.go

@@ -174,7 +174,7 @@
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("Member").Preload("ClientStatus").Preload("ClientType").Preload("ClientOrigin").Preload("ClientLevel").Preload("FollowRecord").Preload("EnterpriseNature").Preload("RegisteredCapital").Preload("Industry").Preload("EnterpriseScale").Preload("Contacts").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
    err := db.Preload("Member").Preload("ClientStatus").Preload("ClientType").Preload("ClientOrigin").Preload("ClientLevel").Preload("FollowRecord").Preload("EnterpriseNature").Preload("RegisteredCapital").Preload("Industry").Preload("EnterpriseScale").Preload("Contacts").Preload("Country").Preload("Province").Preload("City").Preload("Region").Order("id desc").Find(&records).Error
    return records, total, err
}


 model/quotation.go

@@ -117,7 +117,7 @@
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Find(&records).Error
    err := db.Preload("Client").Preload("Contact").Find(&records).Error
    return records, total, err
}


 model/saleChance.go

@@ -14,11 +14,13 @@
        ClientId              int                    `json:"client_id" gorm:"column:client_id;type:int(11);comment:客户ID"`
        SalesSourcesId        int                    `json:"sales_sources_id" gorm:"column:sales_sources_id;type:int(11);comment:商机来源ID"`
        SaleTypeId            int                    `json:"sale_type_id" gorm:"column:sale_type_id;type:int(11);comment:商机类型ID"`
        SaleType              SaleType               `json:"sale_type" `
        SaleStageId           int                    `json:"sale_stage_id" gorm:"column:sale_stage_id;type:int(11);comment:商机阶段ID"`
        SaleStage             SaleStage              `json:"sale_stage" gorm:"foreignKey:SaleStageId;references:Id"`
        MemberId              int                    `json:"member_id" gorm:"column:member_id;type:int(11);comment:销售负责人ID"`
        Member                User                   `json:"member" gorm:"foreignKey:MemberId"`
        RegularCustomersId    int                    `json:"regular_customers_id" gorm:"column:regular_customers_id;type:int(11);comment:常客ID"`
        RegularCustomers      RegularCustomers       `json:"regular_customers"`
        Competitors           string                 `json:"competitors" gorm:"column:competitors;type:varchar(255);comment:竞争对手"`
        PossibilitiesId       int                    `json:"possibilities_id" gorm:"column:possibilities_id;type:int(11);comment:可能性ID"`
        Possibility           Possibility            `json:"possibility" gorm:"foreignKey:PossibilitiesId;references:Id"`
@@ -43,7 +45,7 @@
        Contact               Contact                `json:"contact" gorm:"foreignKey:ContactId;references:Id"`
        Client                Client                 `json:"client" gorm:"foreignKey:ClientId;references:Id"`
        CollectionProjections []CollectionProjection `json:"collection_projections" gorm:"foreignKey:SaleChanceId"`
        SalesSources          SalesSources
        SalesSources          SalesSources           `json:"sales_sources"`
        Address
        gorm.Model `json:"-"`
    }
@@ -155,7 +157,7 @@
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Contact").Find(&records).Error
    err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error
    return records, total, err
}


 model/salesLeads.go

@@ -133,7 +133,7 @@
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("FollowRecord").Find(&records).Error
    err := db.Preload("Province").Preload("City").Preload("FollowRecord").Find(&records).Error
    return records, total, err
}