Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

zhangqian

2023-08-24 1448b58d3cd1bb363438d913f8dbb09770138a74

Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

 docs/docs.go

@@ -15235,7 +15235,7 @@
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\"}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\",\"representative\": \"法定代表人\", \"registration_time\": \"注册时间\", \"business_scope\": \"经营范围\", \"remark\": \"备注\"}",
                    "type": "object",
                    "additionalProperties": true
                }

 docs/swagger.json

@@ -15223,7 +15223,7 @@
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\"}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"客户名称\", \"phone\": \"手机号码\", \"detail_address\":\"详细地址\", \"next_visit_time\":\"下回回访日期\", \"member_name\": \"销售负责人\", \"client_status\": \"客户状态\", \"client_level\": \"重要级别\",\"representative\": \"法定代表人\", \"registration_time\": \"注册时间\", \"business_scope\": \"经营范围\", \"remark\": \"备注\"}",
                    "type": "object",
                    "additionalProperties": true
                }

 docs/swagger.yaml

@@ -3444,7 +3444,9 @@
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"name": "客户名称",
          "phone": "手机号码", "detail_address":"详细地址", "next_visit_time":"下回回访日期", "member_name":
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别"}'
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别","representative":
          "法定代表人", "registration_time": "注册时间", "business_scope": "经营范围", "remark":
          "备注"}'
        type: object
    type: object
  request.GetContactList:

 model/client.go

@@ -74,7 +74,7 @@
        for key, value := range slf.SearchMap {
            switch v := value.(type) {
            case string:
                if key == "name" || key == "number" || key == "detail_address" {
                if key == "name" || key == "number" || key == "detail_address" || key == "remark" || key == "business_scope" || key == "registration_time" || key == "representative" {
                    db = db.Where(key+" LIKE ?", "%"+v+"%")
                }


 model/request/client.go

@@ -31,7 +31,7 @@

type GetClientList struct {
    PageInfo
    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": "重要级别"}
    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": "重要级别","representative": "法定代表人", "registration_time": "注册时间", "business_scope": "经营范围", "remark": "备注"}
}

type DeleteClient struct {