From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:32:10 +0800
Subject: [PATCH] fix
---
docs/swagger.yaml | 88 +++++++++-----
model/contact.go | 4
docs/docs.go | 121 ++++++++++++-------
docs/swagger.json | 121 ++++++++++++-------
model/request/contact.go | 2
5 files changed, 213 insertions(+), 123 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index aa37bdd..f65be80 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -8022,9 +8022,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "娣诲姞鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "娣诲姞鍚堝悓鐘舵��",
"parameters": [
{
"description": "鏌ヨ鍙傛暟",
@@ -8052,9 +8052,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鍒犻櫎鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "鍒犻櫎鍚堝悓鐘舵��",
"parameters": [
{
"type": "integer",
@@ -8080,22 +8080,66 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛�",
+ "summary": "鑾峰彇鍚堝悓鐘舵�佸垪琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "ServiceContractStatusKeywordCustomerName"
+ ],
+ "name": "keywordType",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "ServiceContractStatusQueryClassExpireLessThen60Days"
+ ],
+ "name": "queryClass",
+ "in": "query"
+ }
+ ],
"responses": {
"200": {
"description": "OK",
"schema": {
"allOf": [
{
- "$ref": "#/definitions/contextx.Response"
+ "$ref": "#/definitions/response.ListResponse"
},
{
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/response.ServiceContractStatusResponse"
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ServiceContractStatus"
+ }
}
}
}
@@ -8111,9 +8155,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鏇存柊鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "鏇存柊鍚堝悓鐘舵��",
"parameters": [
{
"description": "鏌ヨ鍙傛暟",
@@ -8121,7 +8165,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.UpdateServiceContractStatuss"
+ "$ref": "#/definitions/request.UpdateServiceContractStatus"
}
}
],
@@ -10523,6 +10567,24 @@
"ServiceContractQueryClassExpireAfter60Day",
"ServiceContractQueryClassExpiredBefore15Day",
"ServiceContractQueryClassExpiredBefore60Day"
+ ]
+ },
+ "constvar.ServiceContractStatusKeywordType": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "ServiceContractStatusKeywordCustomerName"
+ ]
+ },
+ "constvar.ServiceContractStatusQueryClass": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "ServiceContractStatusQueryClassExpireLessThen60Days"
]
},
"constvar.ServiceFeeKeywordType": {
@@ -14287,10 +14349,10 @@
},
"request.AddServiceContractStatus": {
"type": "object",
- "required": [
- "name"
- ],
"properties": {
+ "id": {
+ "type": "integer"
+ },
"name": {
"type": "string"
}
@@ -15127,7 +15189,7 @@
"type": "integer"
},
"search_map": {
- "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\"}",
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\", \"client_id\": \"clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜篭"}",
"type": "object",
"additionalProperties": true
}
@@ -17562,30 +17624,12 @@
},
"request.UpdateServiceContractStatus": {
"type": "object",
- "required": [
- "id",
- "name"
- ],
"properties": {
"id": {
"type": "integer"
},
"name": {
"type": "string"
- }
- }
- },
- "request.UpdateServiceContractStatuss": {
- "type": "object",
- "required": [
- "service_contract_status"
- ],
- "properties": {
- "service_contract_status": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/request.UpdateServiceContractStatus"
- }
}
}
},
@@ -18877,17 +18921,6 @@
"type": "array",
"items": {
"$ref": "#/definitions/model.Satisfaction"
- }
- }
- }
- },
- "response.ServiceContractStatusResponse": {
- "type": "object",
- "properties": {
- "list": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/model.ServiceContractStatus"
}
}
}
diff --git a/docs/swagger.json b/docs/swagger.json
index d82848e..bb2f481 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -8010,9 +8010,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "娣诲姞鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "娣诲姞鍚堝悓鐘舵��",
"parameters": [
{
"description": "鏌ヨ鍙傛暟",
@@ -8040,9 +8040,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鍒犻櫎鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "鍒犻櫎鍚堝悓鐘舵��",
"parameters": [
{
"type": "integer",
@@ -8068,22 +8068,66 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛�",
+ "summary": "鑾峰彇鍚堝悓鐘舵�佸垪琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "ServiceContractStatusKeywordCustomerName"
+ ],
+ "name": "keywordType",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "ServiceContractStatusQueryClassExpireLessThen60Days"
+ ],
+ "name": "queryClass",
+ "in": "query"
+ }
+ ],
"responses": {
"200": {
"description": "OK",
"schema": {
"allOf": [
{
- "$ref": "#/definitions/contextx.Response"
+ "$ref": "#/definitions/response.ListResponse"
},
{
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/response.ServiceContractStatusResponse"
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ServiceContractStatus"
+ }
}
}
}
@@ -8099,9 +8143,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鏇存柊鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "鏇存柊鍚堝悓鐘舵��",
"parameters": [
{
"description": "鏌ヨ鍙傛暟",
@@ -8109,7 +8153,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.UpdateServiceContractStatuss"
+ "$ref": "#/definitions/request.UpdateServiceContractStatus"
}
}
],
@@ -10511,6 +10555,24 @@
"ServiceContractQueryClassExpireAfter60Day",
"ServiceContractQueryClassExpiredBefore15Day",
"ServiceContractQueryClassExpiredBefore60Day"
+ ]
+ },
+ "constvar.ServiceContractStatusKeywordType": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "ServiceContractStatusKeywordCustomerName"
+ ]
+ },
+ "constvar.ServiceContractStatusQueryClass": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "ServiceContractStatusQueryClassExpireLessThen60Days"
]
},
"constvar.ServiceFeeKeywordType": {
@@ -14275,10 +14337,10 @@
},
"request.AddServiceContractStatus": {
"type": "object",
- "required": [
- "name"
- ],
"properties": {
+ "id": {
+ "type": "integer"
+ },
"name": {
"type": "string"
}
@@ -15115,7 +15177,7 @@
"type": "integer"
},
"search_map": {
- "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\"}",
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\", \"client_id\": \"clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜篭"}",
"type": "object",
"additionalProperties": true
}
@@ -17550,30 +17612,12 @@
},
"request.UpdateServiceContractStatus": {
"type": "object",
- "required": [
- "id",
- "name"
- ],
"properties": {
"id": {
"type": "integer"
},
"name": {
"type": "string"
- }
- }
- },
- "request.UpdateServiceContractStatuss": {
- "type": "object",
- "required": [
- "service_contract_status"
- ],
- "properties": {
- "service_contract_status": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/request.UpdateServiceContractStatus"
- }
}
}
},
@@ -18865,17 +18909,6 @@
"type": "array",
"items": {
"$ref": "#/definitions/model.Satisfaction"
- }
- }
- }
- },
- "response.ServiceContractStatusResponse": {
- "type": "object",
- "properties": {
- "list": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/model.ServiceContractStatus"
}
}
}
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 3ae14c2..2f23a4c 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -270,6 +270,18 @@
- ServiceContractQueryClassExpireAfter60Day
- ServiceContractQueryClassExpiredBefore15Day
- ServiceContractQueryClassExpiredBefore60Day
+ constvar.ServiceContractStatusKeywordType:
+ enum:
+ - ""
+ type: string
+ x-enum-varnames:
+ - ServiceContractStatusKeywordCustomerName
+ constvar.ServiceContractStatusQueryClass:
+ enum:
+ - ""
+ type: string
+ x-enum-varnames:
+ - ServiceContractStatusQueryClassExpireLessThen60Days
constvar.ServiceFeeKeywordType:
enum:
- 瀹㈡埛鍚嶇О
@@ -2823,10 +2835,10 @@
type: object
request.AddServiceContractStatus:
properties:
+ id:
+ type: integer
name:
type: string
- required:
- - name
type: object
request.AddServiceContractType:
properties:
@@ -3407,7 +3419,8 @@
additionalProperties: true
description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "瀹㈡埛鍚嶇О",
"phone": "鎵嬫満鍙风爜", "detail_address":"璇︾粏鍦板潃", "next_visit_time":"涓嬪洖鍥炶鏃ユ湡", "member_name":
- "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉"}'
+ "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉",
+ "client_id": "clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜�"}'
type: object
type: object
request.GetContractList:
@@ -5066,18 +5079,6 @@
type: integer
name:
type: string
- required:
- - id
- - name
- type: object
- request.UpdateServiceContractStatuss:
- properties:
- service_contract_status:
- items:
- $ref: '#/definitions/request.UpdateServiceContractStatus'
- type: array
- required:
- - service_contract_status
type: object
request.UpdateServiceContractType:
properties:
@@ -5946,13 +5947,6 @@
list:
items:
$ref: '#/definitions/model.Satisfaction'
- type: array
- type: object
- response.ServiceContractStatusResponse:
- properties:
- list:
- items:
- $ref: '#/definitions/model.ServiceContractStatus'
type: array
type: object
response.ServiceContractTypeResponse:
@@ -10956,9 +10950,9 @@
description: OK
schema:
$ref: '#/definitions/contextx.Response'
- summary: 娣诲姞鏈嶅姟鍚堝悓鐘舵��
+ summary: 娣诲姞鍚堝悓鐘舵��
tags:
- - ServiceContractStatus
+ - 鍚堝悓鐘舵��
/api/serviceContractStatus/delete/{id}:
delete:
parameters:
@@ -10974,11 +10968,37 @@
description: OK
schema:
$ref: '#/definitions/contextx.Response'
- summary: 鍒犻櫎鏈嶅姟鍚堝悓鐘舵��
+ summary: 鍒犻櫎鍚堝悓鐘舵��
tags:
- - ServiceContractStatus
+ - 鍚堝悓鐘舵��
/api/serviceContractStatus/list:
get:
+ parameters:
+ - in: query
+ name: keyword
+ type: string
+ - enum:
+ - ""
+ in: query
+ name: keywordType
+ type: string
+ x-enum-varnames:
+ - ServiceContractStatusKeywordCustomerName
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - enum:
+ - ""
+ in: query
+ name: queryClass
+ type: string
+ x-enum-varnames:
+ - ServiceContractStatusQueryClassExpireLessThen60Days
produces:
- application/json
responses:
@@ -10986,14 +11006,16 @@
description: OK
schema:
allOf:
- - $ref: '#/definitions/contextx.Response'
+ - $ref: '#/definitions/response.ListResponse'
- properties:
data:
- $ref: '#/definitions/response.ServiceContractStatusResponse'
+ items:
+ $ref: '#/definitions/model.ServiceContractStatus'
+ type: array
type: object
- summary: 鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛�
+ summary: 鑾峰彇鍚堝悓鐘舵�佸垪琛�
tags:
- - ServiceContractStatus
+ - 鍚堝悓鐘舵��
/api/serviceContractStatus/update:
put:
parameters:
@@ -11002,7 +11024,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.UpdateServiceContractStatuss'
+ $ref: '#/definitions/request.UpdateServiceContractStatus'
produces:
- application/json
responses:
@@ -11010,9 +11032,9 @@
description: OK
schema:
$ref: '#/definitions/contextx.Response'
- summary: 鏇存柊鏈嶅姟鍚堝悓鐘舵��
+ summary: 鏇存柊鍚堝悓鐘舵��
tags:
- - ServiceContractStatus
+ - 鍚堝悓鐘舵��
/api/serviceContractType/add:
post:
parameters:
diff --git a/model/contact.go b/model/contact.go
index 596ecf7..01c2732 100644
--- a/model/contact.go
+++ b/model/contact.go
@@ -93,8 +93,10 @@
}
}
case int:
+ case int64:
+ case float64:
if key == "client_id" {
- db = db.Where("client_id = ?", v)
+ db = db.Where("client_id = ? and is_first = true", v)
}
}
}
diff --git a/model/request/contact.go b/model/request/contact.go
index 7cecb9a..de6601f 100644
--- a/model/request/contact.go
+++ b/model/request/contact.go
@@ -29,7 +29,7 @@
type GetContactList 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": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉"}
+ 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": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉", "client_id": "clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜�"}
}
type DeleteContact struct {
--
Gitblit v1.8.0