From d2c1d8192b60d6981f0a743ef9cab8e37496e6a3 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 09 八月 2023 10:03:41 +0800
Subject: [PATCH] fix
---
model/client.go | 13 +++++++++++++
model/request/client.go | 2 +-
docs/swagger.yaml | 11 +++++++----
docs/docs.go | 7 +++++--
docs/swagger.json | 7 +++++--
5 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 7e7d830..1f6e1d3 100644
--- a/docs/docs.go
+++ b/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
}
diff --git a/docs/swagger.json b/docs/swagger.json
index f9dbb35..e81bb3f 100644
--- a/docs/swagger.json
+++ b/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
}
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 37ccd6b..0d41be3 100644
--- a/docs/swagger.yaml
+++ b/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
diff --git a/model/client.go b/model/client.go
index 11ceaa1..25c3935 100644
--- a/model/client.go
+++ b/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:鏈嶅姟璐熻矗浜篒D"`
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)
diff --git a/model/request/client.go b/model/request/client.go
index d989869..fb41a58 100644
--- a/model/request/client.go
+++ b/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 {
--
Gitblit v1.8.0