fix

wangpengfei

2023-08-09 1041c15ba9f55e1be4078fc24cef9acfbc0a4326

fix

add preload in searching client

 constvar/const.go

@@ -35,12 +35,12 @@
type SalesStatus int



const (

    SalesStatusFail                          SalesStatus = -1   // 失败

    SalesStatusNew                           SalesStatus = iota // 新建

    SalesStatusIng                                              // 进行中

    SalesStatusSuccess                                          // 成功

    SalesStatusLevelUptoClient                                  // 升级为客户

    SalesStatusLevelUptoClientAndSalesChance                    // 升级为客户并且有销售机会

    SalesStatusFail                          SalesStatus = -1   // 失败
)



type CurrencyType int


 docs/docs.go

@@ -9659,12 +9659,12 @@
        "constvar.SalesStatus": {
            "type": "integer",
            "enum": [
                -1,
                0,
                1,
                2,
                3,
                4,
                5
                -1
            ],
            "x-enum-comments": {
                "SalesStatusFail": "失败",
@@ -9675,12 +9675,12 @@
                "SalesStatusSuccess": "成功"
            },
            "x-enum-varnames": [
                "SalesStatusFail",
                "SalesStatusNew",
                "SalesStatusIng",
                "SalesStatusSuccess",
                "SalesStatusLevelUptoClient",
                "SalesStatusLevelUptoClientAndSalesChance"
                "SalesStatusLevelUptoClientAndSalesChance",
                "SalesStatusFail"
            ]
        },
        "constvar.ServiceContractKeywordType": {
@@ -13346,6 +13346,7 @@
                    "type": "integer"
                },
                "type": {
                    "description": "类型: client: 客户; salesLead: 销售线索; contact: 联系人; followRecord: 跟进记录",
                    "type": "string"
                }
            }

 docs/swagger.json

@@ -9647,12 +9647,12 @@
        "constvar.SalesStatus": {
            "type": "integer",
            "enum": [
                -1,
                0,
                1,
                2,
                3,
                4,
                5
                -1
            ],
            "x-enum-comments": {
                "SalesStatusFail": "失败",
@@ -9663,12 +9663,12 @@
                "SalesStatusSuccess": "成功"
            },
            "x-enum-varnames": [
                "SalesStatusFail",
                "SalesStatusNew",
                "SalesStatusIng",
                "SalesStatusSuccess",
                "SalesStatusLevelUptoClient",
                "SalesStatusLevelUptoClientAndSalesChance"
                "SalesStatusLevelUptoClientAndSalesChance",
                "SalesStatusFail"
            ]
        },
        "constvar.ServiceContractKeywordType": {
@@ -13334,6 +13334,7 @@
                    "type": "integer"
                },
                "type": {
                    "description": "类型: client: 客户; salesLead: 销售线索; contact: 联系人; followRecord: 跟进记录",
                    "type": "string"
                }
            }

 docs/swagger.yaml

@@ -116,12 +116,12 @@
    - ReceiptQueryClassExpireLessThen60Days
  constvar.SalesStatus:
    enum:
    - -1
    - 0
    - 1
    - 2
    - 3
    - 4
    - 5
    - -1
    type: integer
    x-enum-comments:
      SalesStatusFail: 失败
@@ -131,12 +131,12 @@
      SalesStatusNew: 新建
      SalesStatusSuccess: 成功
    x-enum-varnames:
    - SalesStatusFail
    - SalesStatusNew
    - SalesStatusIng
    - SalesStatusSuccess
    - SalesStatusLevelUptoClient
    - SalesStatusLevelUptoClientAndSalesChance
    - SalesStatusFail
  constvar.ServiceContractKeywordType:
    enum:
    - 服务合同编号
@@ -2614,6 +2614,8 @@
      member_id:
        type: integer
      type:
        description: '类型: client: 客户; salesLead: 销售线索; contact: 联系人; followRecord:
          跟进记录'
        type: string
    type: object
  request.CasbinInfo:

 model/client.go

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

    err := db.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").Find(&records).Error
    return records, total, err
}


 model/request/assign.go

@@ -2,6 +2,6 @@


type Assign struct {

    MemberId int    `json:"member_id"`

    Type     string `json:"type"`

    Type     string `json:"type"` // 类型: client: 客户; salesLead: 销售线索; contact: 联系人; followRecord: 跟进记录
    Ids      []int  `json:"ids"`

}