From 2f3c15af426ff8fda771743e9c880837ddcf61ed Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 17:39:02 +0800
Subject: [PATCH] fix
---
model/quotation.go | 12 ++++--------
docs/swagger.yaml | 2 +-
docs/docs.go | 2 +-
docs/swagger.json | 2 +-
model/request/quotation.go | 2 +-
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 8d18427..ebddcb8 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -14954,7 +14954,7 @@
"description": "姣忛〉澶у皬",
"type": "integer"
},
- "searchMap": {
+ "search_map": {
"description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d, \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"contact_name\": \"鑱旂郴浜篭", \"validity_date\": \"鏈夋晥鏈焅"}",
"type": "object",
"additionalProperties": true
diff --git a/docs/swagger.json b/docs/swagger.json
index f5753ae..3a7d222 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -14942,7 +14942,7 @@
"description": "姣忛〉澶у皬",
"type": "integer"
},
- "searchMap": {
+ "search_map": {
"description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d, \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"contact_name\": \"鑱旂郴浜篭", \"validity_date\": \"鏈夋晥鏈焅"}",
"type": "object",
"additionalProperties": true
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 24f3e2d..6a4f039 100644
--- a/docs/swagger.yaml
+++ b/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":
閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐ｄ汉", "contact_name": "鑱旂郴浜�",
diff --git a/model/quotation.go b/model/quotation.go
index dea2f4e..b354f81 100644
--- a/model/quotation.go
+++ b/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:
diff --git a/model/request/quotation.go b/model/request/quotation.go
index 1c42250..f534363 100644
--- a/model/request/quotation.go
+++ b/model/request/quotation.go
@@ -26,5 +26,5 @@
type GetQuotationList struct {
PageInfo
- SearchMap map[string]interface{} // 鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"sale_chance_id": 閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐ｄ汉", "contact_name": "鑱旂郴浜�", "validity_date": "鏈夋晥鏈�"}
+ SearchMap map[string]interface{} `json:"search_map"` // 鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"sale_chance_id": 閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐ｄ汉", "contact_name": "鑱旂郴浜�", "validity_date": "鏈夋晥鏈�"}
}
--
Gitblit v1.8.0