fix

wangpengfei

2023-08-09 d2c1d8192b60d6981f0a743ef9cab8e37496e6a3

fix

fix multi-criteria query to client

 docs/docs.go

@@ -9894,6 +9894,9 @@
                "latest_service_time": {
                    "type": "string"
                },
                "member": {
                    "$ref": "#/definitions/model.User"
                },
                "member_id": {
                    "type": "integer"
                },
@@ -13572,7 +13575,7 @@
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; \"name\": 客户名称; \"number\": 公海客户",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\"}",
                    "type": "object",
                    "additionalProperties": true
                }
@@ -13756,7 +13759,7 @@
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"} {\"client_name\": \"客户名称\", \"number\": \"销售线索编号\", \"contact_name\": \"联系人姓名\", \"phone\": \"手机号码\", \"sales_resources\": \"商机来源\", \"city\": \"城市\", \"province\": \"省份\", \"member_name\": \"负责人\"}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"} {\"name\": \"客户名称\", \"number\": \"销售线索编号\", \"contact_name\": \"联系人姓名\", \"phone\": \"手机号码\", \"sales_resources\": \"商机来源\", \"city\": \"城市\", \"province\": \"省份\", \"member_name\": \"负责人\"}",
                    "type": "object",
                    "additionalProperties": true
                }

 docs/swagger.json

@@ -9882,6 +9882,9 @@
                "latest_service_time": {
                    "type": "string"
                },
                "member": {
                    "$ref": "#/definitions/model.User"
                },
                "member_id": {
                    "type": "integer"
                },
@@ -13560,7 +13563,7 @@
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; \"name\": 客户名称; \"number\": 公海客户",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\"}",
                    "type": "object",
                    "additionalProperties": true
                }
@@ -13744,7 +13747,7 @@
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"} {\"client_name\": \"客户名称\", \"number\": \"销售线索编号\", \"contact_name\": \"联系人姓名\", \"phone\": \"手机号码\", \"sales_resources\": \"商机来源\", \"city\": \"城市\", \"province\": \"省份\", \"member_name\": \"负责人\"}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"} {\"name\": \"客户名称\", \"number\": \"销售线索编号\", \"contact_name\": \"联系人姓名\", \"phone\": \"手机号码\", \"sales_resources\": \"商机来源\", \"city\": \"城市\", \"province\": \"省份\", \"member_name\": \"负责人\"}",
                    "type": "object",
                    "additionalProperties": true
                }

 docs/swagger.yaml

@@ -356,6 +356,8 @@
        type: integer
      latest_service_time:
        type: string
      member:
        $ref: '#/definitions/model.User'
      member_id:
        type: integer
      name:
@@ -2828,8 +2830,9 @@
        type: integer
      search_map:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; "name": 客户名称; "number":
          公海客户'
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"name": "客户名称",
          "phone": "手机号码", "detail_address":"详细地址", "next_visit_time":"下回回访日期", "member_name":
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别"}'
        type: object
    type: object
  request.GetContactList:
@@ -2956,8 +2959,8 @@
        type: integer
      search_map:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"} {"client_name":
          "客户名称", "number": "销售线索编号", "contact_name": "联系人姓名", "phone": "手机号码", "sales_resources":
        description: '搜索条件: map[string]interface{}{"name": "xxx"} {"name": "客户名称",
          "number": "销售线索编号", "contact_name": "联系人姓名", "phone": "手机号码", "sales_resources":
          "商机来源", "city": "城市", "province": "省份", "member_name": "负责人"}'
        type: object
    type: object

 model/client.go

@@ -22,6 +22,7 @@
        ClientLevel       ClientLevel    `json:"client_level" gorm:"foreignKey:ClientLevelId"`
        Contacts          []Contact      `json:"contacts" gorm:"foreignKey:ClientId"`
        MemberId          int            `json:"member_id" gorm:"column:member_id;type:int(11);comment:销售负责人ID"`
        Member            User           `json:"member" gorm:"foreignKey:MemberId"`
        ServiceMemberId   int            `json:"service_member_id" gorm:"column:service_member_id;type:int(11);comment:服务负责人ID"`
        DetailAddress     string         `json:"detail_address" gorm:"column:detail_address;type:varchar(255);comment:详细地址"`
        Remark            string         `json:"remark" gorm:"column:remark;type:varchar(255);comment:备注"`
@@ -97,6 +98,18 @@
                    db = db.Where("member_id = ?", constvar.UserTypeSuper)
                }

                if key == "client_status" {
                    db = db.Joins("ClientStatus").Where("ClientStatus.name LIKE ?", "%"+v+"%")
                }

                if key == "client_level" {
                    db = db.Joins("ClientLevel").Where("ClientLevel.name LIKE ?", "%"+v+"%")
                }

                if key == "member_name" {
                    db = db.Joins("Member").Where("Member.username LIKE ?", "%"+v+"%")
                }

            case int:
                if key == "id" || key == "client_type_id" || key == "client_status_id" || key == "member_id" {
                    db = db.Where(key+" = ?", v)

 model/request/client.go

@@ -30,7 +30,7 @@

type GetClientList struct {
    PageInfo
    SearchMap map[string]interface{} `json:"search_map"` // 搜索条件: map[string]interface{}{"name": "xxx"}; "name": 客户名称; "number": 公海客户
    SearchMap map[string]interface{} `json:"search_map"` // 搜索条件: map[string]interface{}{"name": "xxx"}; {"name": "客户名称", "phone": "手机号码", "detail_address":"详细地址", "next_visit_time":"下回回访日期", "member_name": "销售负责人", "client_status": "客户状态", "client_level": "重要级别"}
}

type DeleteClient struct {