From 724674c54da32406a16264850c3719b2553aada6 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 10 八月 2023 19:35:36 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 docs/docs.go |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 insertions(+), 1 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index b034d29..17994ca 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -8388,7 +8388,7 @@
             }
         },
         "/api/serviceOrder/list": {
-            "get": {
+            "post": {
                 "produces": [
                     "application/json"
                 ],
@@ -8396,6 +8396,17 @@
                     "鏈嶅姟鍗曠鐞�"
                 ],
                 "summary": "鑾峰彇鏈嶅姟鍗曞垪琛�",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.GetServiceOrderList"
+                        }
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -10084,6 +10095,38 @@
                 "ServiceFollowupKeywordCustomerServiceNo",
                 "ServiceFollowupKeywordVisitor",
                 "ServiceFollowupKeywordSatisfactionDegree"
+            ]
+        },
+        "constvar.ServiceOrderKeywordType": {
+            "type": "string",
+            "enum": [
+                "鏈嶅姟鍗曠紪鍙�",
+                "涓婚",
+                "瀹㈡埛鍚嶇О",
+                "瀹為檯澶勭悊鏃堕棿",
+                "鏈嶅姟浜哄憳",
+                "鏈嶅姟鏂瑰紡",
+                "浜у搧绫诲埆",
+                "鏁呴殰绫诲埆"
+            ],
+            "x-enum-varnames": [
+                "ServiceOrderKeywordOrderNumber",
+                "ServiceOrderKeywordSubject",
+                "ServiceOrderKeywordClientName",
+                "ServiceOrderKeywordRealProcessTime",
+                "ServiceOrderKeywordServiceMan",
+                "ServiceOrderKeywordServiceType",
+                "ServiceOrderKeywordProductType",
+                "ServiceOrderKeywordFaultType"
+            ]
+        },
+        "constvar.ServiceOrderQueryClass": {
+            "type": "string",
+            "enum": [
+                ""
+            ],
+            "x-enum-varnames": [
+                "ServiceOrderQueryClassExpireLessThen60Days"
             ]
         },
         "constvar.UserType": {
@@ -11854,8 +11897,17 @@
         "model.ServiceFollowup": {
             "type": "object",
             "properties": {
+                "Member": {
+                    "$ref": "#/definitions/model.User"
+                },
+                "client": {
+                    "$ref": "#/definitions/model.Client"
+                },
                 "clientId": {
                     "type": "integer"
+                },
+                "contact": {
+                    "$ref": "#/definitions/model.Contact"
                 },
                 "contactId": {
                     "type": "integer"
@@ -11869,6 +11921,9 @@
                 "id": {
                     "type": "integer"
                 },
+                "isVisit": {
+                    "$ref": "#/definitions/model.IsVisit"
+                },
                 "isVisitId": {
                     "type": "integer"
                 },
@@ -11877,6 +11932,9 @@
                 },
                 "number": {
                     "type": "string"
+                },
+                "oldMember": {
+                    "$ref": "#/definitions/model.User"
                 },
                 "oldMemberId": {
                     "type": "integer"
@@ -11887,6 +11945,9 @@
                 "remark": {
                     "type": "string"
                 },
+                "satisfaction": {
+                    "$ref": "#/definitions/model.Satisfaction"
+                },
                 "satisfactionId": {
                     "type": "integer"
                 },
@@ -11896,8 +11957,14 @@
                 "serviceOrder": {
                     "$ref": "#/definitions/model.ServiceOrder"
                 },
+                "solveRate": {
+                    "$ref": "#/definitions/model.SolveRate"
+                },
                 "solveRateId": {
                     "type": "integer"
+                },
+                "timelyRate": {
+                    "$ref": "#/definitions/model.TimelyRate"
                 },
                 "timelyRateId": {
                     "type": "integer"
@@ -14425,6 +14492,28 @@
                 }
             }
         },
+        "request.GetServiceOrderList": {
+            "type": "object",
+            "properties": {
+                "keyword": {
+                    "type": "string"
+                },
+                "keywordType": {
+                    "$ref": "#/definitions/constvar.ServiceOrderKeywordType"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                },
+                "queryClass": {
+                    "$ref": "#/definitions/constvar.ServiceOrderQueryClass"
+                }
+            }
+        },
         "request.GetSubOrderList": {
             "type": "object",
             "properties": {

--
Gitblit v1.8.0