fix

wangpengfei

2023-08-15 2f3c15af426ff8fda771743e9c880837ddcf61ed

fix

fix search bug

 docs/docs.go

@@ -14954,7 +14954,7 @@
                    "description": "每页大小",
                    "type": "integer"
                },
                "searchMap": {
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id, \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"contact_name\": \"联系人\", \"validity_date\": \"有效期\"}",
                    "type": "object",
                    "additionalProperties": true

 docs/swagger.json

@@ -14942,7 +14942,7 @@
                    "description": "每页大小",
                    "type": "integer"
                },
                "searchMap": {
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id, \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"contact_name\": \"联系人\", \"validity_date\": \"有效期\"}",
                    "type": "object",
                    "additionalProperties": true

 docs/swagger.yaml

@@ -3396,7 +3396,7 @@
      pageSize:
        description: 每页大小
        type: integer
      searchMap:
      search_map:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"sale_chance_id":
          销售线索id, "client_name": "客户名称", "member_name": "销售负责人", "contact_name": "联系人",

 model/quotation.go

@@ -59,20 +59,16 @@
        for key, value := range slf.SearchMap {
            switch v := value.(type) {
            case string:
                if key == "validity_date" || key == "number" {
                    db = db.Where(key+" = ?", v)
                if key == "number" || key == "validity_date" {
                    db = db.Where(key+" LIKE ?", "%"+v+"%")
                }

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

                if key == "contact_name" {
                    db = db.Joins("Contact").Where("Contact.name = ?", v)
                }

                if key == "validity_date" {
                    db = db.Where(key+" = ?", v)
                    db = db.Joins("Contact").Where("LIKE", "%"+v+"%")
                }

            case int:

 model/request/quotation.go

@@ -26,5 +26,5 @@

type GetQuotationList struct {
    PageInfo
    SearchMap map[string]interface{} // 搜索条件: map[string]interface{}{"name": "xxx"}; {"sale_chance_id": 销售线索id, "client_name": "客户名称", "member_name": "销售负责人", "contact_name": "联系人", "validity_date": "有效期"}
    SearchMap map[string]interface{} `json:"search_map"` // 搜索条件: map[string]interface{}{"name": "xxx"}; {"sale_chance_id": 销售线索id, "client_name": "客户名称", "member_name": "销售负责人", "contact_name": "联系人", "validity_date": "有效期"}
}