From e3a52e666b41c585c5ee0d8072f4c03cc6c229a9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 17:53:14 +0800
Subject: [PATCH] query
---
model/request/common.go | 2
docs/swagger.yaml | 40 ++++++-------
docs/docs.go | 55 ++++++++---------
docs/swagger.json | 55 ++++++++---------
4 files changed, 72 insertions(+), 80 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index f04605d..e297c52 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -537,13 +537,25 @@
"summary": "涓婃姤",
"parameters": [
{
- "description": "鏌ヨ鍙傛暟",
- "name": "object",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/request.ReportWork"
- }
+ "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
}
],
"responses": {
@@ -1556,6 +1568,10 @@
"description": "procedures琛ㄧ殑id",
"type": "integer"
},
+ "reportAmount": {
+ "description": "鎶ュ伐鏁伴噺",
+ "type": "integer"
+ },
"startTime": {
"type": "integer"
},
@@ -1623,6 +1639,9 @@
"properties": {
"channel": {
"type": "integer"
+ },
+ "procedureId": {
+ "type": "integer"
}
}
},
@@ -1638,28 +1657,6 @@
"QueryTypeToday",
"QueryTypeFinished"
]
- },
- "request.ReportWork": {
- "type": "object",
- "required": [
- "procedureId",
- "reportAmount",
- "workerID"
- ],
- "properties": {
- "procedureId": {
- "description": "宸ュ簭id",
- "type": "integer"
- },
- "reportAmount": {
- "description": "鎶ュ伐鏁伴噺",
- "type": "integer"
- },
- "workerID": {
- "description": "鎶ュ憡鑰卛d",
- "type": "string"
- }
- }
},
"request.ReportWorkList": {
"type": "object",
diff --git a/docs/swagger.json b/docs/swagger.json
index dbe1f85..7c3aa4a 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -525,13 +525,25 @@
"summary": "涓婃姤",
"parameters": [
{
- "description": "鏌ヨ鍙傛暟",
- "name": "object",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/request.ReportWork"
- }
+ "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
}
],
"responses": {
@@ -1544,6 +1556,10 @@
"description": "procedures琛ㄧ殑id",
"type": "integer"
},
+ "reportAmount": {
+ "description": "鎶ュ伐鏁伴噺",
+ "type": "integer"
+ },
"startTime": {
"type": "integer"
},
@@ -1611,6 +1627,9 @@
"properties": {
"channel": {
"type": "integer"
+ },
+ "procedureId": {
+ "type": "integer"
}
}
},
@@ -1626,28 +1645,6 @@
"QueryTypeToday",
"QueryTypeFinished"
]
- },
- "request.ReportWork": {
- "type": "object",
- "required": [
- "procedureId",
- "reportAmount",
- "workerID"
- ],
- "properties": {
- "procedureId": {
- "description": "宸ュ簭id",
- "type": "integer"
- },
- "reportAmount": {
- "description": "鎶ュ伐鏁伴噺",
- "type": "integer"
- },
- "workerID": {
- "description": "鎶ュ憡鑰卛d",
- "type": "string"
- }
- }
},
"request.ReportWorkList": {
"type": "object",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 68b35f7..631d3e3 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -466,6 +466,9 @@
proceduresId:
description: procedures琛ㄧ殑id
type: integer
+ reportAmount:
+ description: 鎶ュ伐鏁伴噺
+ type: integer
startTime:
type: integer
updatedAt:
@@ -511,6 +514,8 @@
properties:
channel:
type: integer
+ procedureId:
+ type: integer
type: object
request.QueryType:
enum:
@@ -522,22 +527,6 @@
- QueryTypeUnFinish
- QueryTypeToday
- QueryTypeFinished
- request.ReportWork:
- properties:
- procedureId:
- description: 宸ュ簭id
- type: integer
- reportAmount:
- description: 鎶ュ伐鏁伴噺
- type: integer
- workerID:
- description: 鎶ュ憡鑰卛d
- type: string
- required:
- - procedureId
- - reportAmount
- - workerID
- type: object
request.ReportWorkList:
properties:
page:
@@ -1074,12 +1063,21 @@
/v1/reportWork/report:
post:
parameters:
- - description: 鏌ヨ鍙傛暟
- in: body
- name: object
+ - description: 宸ュ簭id
+ in: query
+ name: procedureId
required: true
- schema:
- $ref: '#/definitions/request.ReportWork'
+ type: integer
+ - description: 鎶ュ伐鏁伴噺
+ in: query
+ name: reportAmount
+ required: true
+ type: integer
+ - description: 鎶ュ憡鑰卛d
+ in: query
+ name: workerID
+ required: true
+ type: string
produces:
- application/json
responses:
diff --git a/model/request/common.go b/model/request/common.go
index 2076da7..474e019 100644
--- a/model/request/common.go
+++ b/model/request/common.go
@@ -25,5 +25,5 @@
type ReportWorkList struct {
PageInfo
- ProcedureId uint `json:"procedureId" binding:"required"` //宸ュ簭id
+ ProcedureId uint `json:"procedureId" binding:"required" form:"procedureId"` //宸ュ簭id
}
--
Gitblit v1.8.0