From c17949e4999ed195816b34f15c015dcd7a2b019e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 17:54:55 +0800
Subject: [PATCH] query

---
 api/v1/report_work.go |    4 
 docs/swagger.yaml     |   52 ++++++------
 docs/docs.go          |   72 +++++++++---------
 docs/swagger.json     |   72 +++++++++---------
 4 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/api/v1/report_work.go b/api/v1/report_work.go
index 9bfc2be..4e08883 100644
--- a/api/v1/report_work.go
+++ b/api/v1/report_work.go
@@ -16,7 +16,7 @@
 // @Tags      鎶ュ伐
 // @Summary   涓婃姤
 // @Produce   application/json
-// @Param     object  query    request.ReportWork true  "鏌ヨ鍙傛暟"
+// @Param     object  body    request.ReportWork true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  contextx.Response{}  "鎴愬姛"
 // @Router    /v1/reportWork/report [post]
 func (slf *ReportWorkApi) Report(c *gin.Context) {
@@ -38,7 +38,7 @@
 // @Tags      鎶ュ伐
 // @Summary   鎶ュ伐鍒楄〃
 // @Produce   application/json
-// @Param     object  body    request.ReportWorkList true  "鏌ヨ鍙傛暟"
+// @Param     object  query    request.ReportWorkList true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  contextx.ResponseList{data=[]model.ReportWork}  "鎴愬姛"
 // @Router    /v1/reportWork/list [get]
 func (slf *ReportWorkApi) ReportList(c *gin.Context) {
diff --git a/docs/docs.go b/docs/docs.go
index e297c52..40d5d3d 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -492,13 +492,23 @@
                 "summary": "鎶ュ伐鍒楄〃",
                 "parameters": [
                     {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.ReportWorkList"
-                        }
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "宸ュ簭id",
+                        "name": "procedureId",
+                        "in": "query",
+                        "required": true
                     }
                 ],
                 "responses": {
@@ -537,25 +547,13 @@
                 "summary": "涓婃姤",
                 "parameters": [
                     {
-                        "type": "integer",
-                        "description": "宸ュ簭id",
-                        "name": "procedureId",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "鎶ュ伐鏁伴噺",
-                        "name": "reportAmount",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "鎶ュ憡鑰卛d",
-                        "name": "workerID",
-                        "in": "query",
-                        "required": true
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.ReportWork"
+                        }
                     }
                 ],
                 "responses": {
@@ -1658,23 +1656,25 @@
                 "QueryTypeFinished"
             ]
         },
-        "request.ReportWorkList": {
+        "request.ReportWork": {
             "type": "object",
             "required": [
-                "procedureId"
+                "procedureId",
+                "reportAmount",
+                "workerID"
             ],
             "properties": {
-                "page": {
-                    "description": "椤电爜",
-                    "type": "integer"
-                },
-                "pageSize": {
-                    "description": "姣忛〉澶у皬",
-                    "type": "integer"
-                },
                 "procedureId": {
                     "description": "宸ュ簭id",
                     "type": "integer"
+                },
+                "reportAmount": {
+                    "description": "鎶ュ伐鏁伴噺",
+                    "type": "integer"
+                },
+                "workerID": {
+                    "description": "鎶ュ憡鑰卛d",
+                    "type": "string"
                 }
             }
         },
diff --git a/docs/swagger.json b/docs/swagger.json
index 7c3aa4a..d6f421a 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -480,13 +480,23 @@
                 "summary": "鎶ュ伐鍒楄〃",
                 "parameters": [
                     {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.ReportWorkList"
-                        }
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "宸ュ簭id",
+                        "name": "procedureId",
+                        "in": "query",
+                        "required": true
                     }
                 ],
                 "responses": {
@@ -525,25 +535,13 @@
                 "summary": "涓婃姤",
                 "parameters": [
                     {
-                        "type": "integer",
-                        "description": "宸ュ簭id",
-                        "name": "procedureId",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "鎶ュ伐鏁伴噺",
-                        "name": "reportAmount",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "鎶ュ憡鑰卛d",
-                        "name": "workerID",
-                        "in": "query",
-                        "required": true
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.ReportWork"
+                        }
                     }
                 ],
                 "responses": {
@@ -1646,23 +1644,25 @@
                 "QueryTypeFinished"
             ]
         },
-        "request.ReportWorkList": {
+        "request.ReportWork": {
             "type": "object",
             "required": [
-                "procedureId"
+                "procedureId",
+                "reportAmount",
+                "workerID"
             ],
             "properties": {
-                "page": {
-                    "description": "椤电爜",
-                    "type": "integer"
-                },
-                "pageSize": {
-                    "description": "姣忛〉澶у皬",
-                    "type": "integer"
-                },
                 "procedureId": {
                     "description": "宸ュ簭id",
                     "type": "integer"
+                },
+                "reportAmount": {
+                    "description": "鎶ュ伐鏁伴噺",
+                    "type": "integer"
+                },
+                "workerID": {
+                    "description": "鎶ュ憡鑰卛d",
+                    "type": "string"
                 }
             }
         },
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 631d3e3..a375c00 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -527,19 +527,21 @@
     - QueryTypeUnFinish
     - QueryTypeToday
     - QueryTypeFinished
-  request.ReportWorkList:
+  request.ReportWork:
     properties:
-      page:
-        description: 椤电爜
-        type: integer
-      pageSize:
-        description: 姣忛〉澶у皬
-        type: integer
       procedureId:
         description: 宸ュ簭id
         type: integer
+      reportAmount:
+        description: 鎶ュ伐鏁伴噺
+        type: integer
+      workerID:
+        description: 鎶ュ憡鑰卛d
+        type: string
     required:
     - procedureId
+    - reportAmount
+    - workerID
     type: object
   request.SendProcessParams:
     properties:
@@ -1037,12 +1039,19 @@
   /v1/reportWork/list:
     get:
       parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      - description: 宸ュ簭id
+        in: query
+        name: procedureId
         required: true
-        schema:
-          $ref: '#/definitions/request.ReportWorkList'
+        type: integer
       produces:
       - application/json
       responses:
@@ -1063,21 +1072,12 @@
   /v1/reportWork/report:
     post:
       parameters:
-      - description: 宸ュ簭id
-        in: query
-        name: procedureId
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
         required: true
-        type: integer
-      - description: 鎶ュ伐鏁伴噺
-        in: query
-        name: reportAmount
-        required: true
-        type: integer
-      - description: 鎶ュ憡鑰卛d
-        in: query
-        name: workerID
-        required: true
-        type: string
+        schema:
+          $ref: '#/definitions/request.ReportWork'
       produces:
       - application/json
       responses:

--
Gitblit v1.8.0