From 1448b58d3cd1bb363438d913f8dbb09770138a74 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 24 八月 2023 15:13:13 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm
---
model/client.go | 2 +-
model/request/client.go | 2 +-
docs/swagger.yaml | 4 +++-
docs/docs.go | 2 +-
docs/swagger.json | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index e7b3a29..b115cb4 100644
--- a/docs/docs.go
+++ b/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
}
diff --git a/docs/swagger.json b/docs/swagger.json
index b107890..c69815f 100644
--- a/docs/swagger.json
+++ b/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
}
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 647faa9..df81be3 100644
--- a/docs/swagger.yaml
+++ b/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:
diff --git a/model/client.go b/model/client.go
index 084854d..639b0aa 100644
--- a/model/client.go
+++ b/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+"%")
}
diff --git a/model/request/client.go b/model/request/client.go
index 540f3f3..615df7b 100644
--- a/model/request/client.go
+++ b/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 {
--
Gitblit v1.8.0