From 067650e77790adeb5222b7736649cb5b6b016162 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 28 四月 2024 10:49:44 +0800
Subject: [PATCH] 时间范围和该工人以往添加记录重复性校验
---
docs/swagger.json | 204 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 196 insertions(+), 8 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index cdb5d20..2e1c8b7 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -189,6 +189,36 @@
}
}
},
+ "/api-jl/v1/attendance/getTemplate": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鑰冨嫟绠＄悊"
+ ],
+ "summary": "鑾峰彇妯＄増鍒楄〃",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.TemplateCategoryRequest"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/attendance/saveAttendanceRule": {
"post": {
"produces": [
@@ -206,6 +236,43 @@
"required": true,
"schema": {
"$ref": "#/definitions/models.AttendanceRule"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/attendance/updateAttendance": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鑰冨嫟绠＄悊"
+ ],
+ "summary": "鏇存柊鑰冨嫟",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateAttendance"
}
},
{
@@ -2265,6 +2332,21 @@
"DictTypeSpec"
]
},
+ "constvar.FileTemplateCategory": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "FileTemplateCategory_Output": "鍑哄簱",
+ "FileTemplateCategory_Selfmade": "鍏ュ簱-鑷埗"
+ },
+ "x-enum-varnames": [
+ "FileTemplateCategory_Selfmade",
+ "FileTemplateCategory_Output"
+ ]
+ },
"constvar.MiniDictType": {
"type": "integer",
"enum": [
@@ -2942,10 +3024,6 @@
"id": {
"type": "integer"
},
- "name": {
- "description": "杞﹂棿",
- "type": "string"
- },
"startDate": {
"description": "寮�濮嬫棩鏈�",
"type": "string"
@@ -2969,9 +3047,17 @@
"description": "宸ヤ汉ID",
"type": "string"
},
+ "workshop": {
+ "description": "杞﹂棿缂栧彿",
+ "type": "string"
+ },
"workshopGroup": {
"description": "杞︾粍",
"type": "integer"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚嶇О",
+ "type": "string"
}
}
},
@@ -3321,7 +3407,8 @@
"startWorkerPosition",
"workerId",
"workshop",
- "workshopGroup"
+ "workshopGroup",
+ "workshopName"
],
"properties": {
"endDate": {
@@ -3345,12 +3432,16 @@
"type": "string"
},
"workshop": {
- "description": "杞﹂棿",
+ "description": "杞﹂棿缂栧彿",
"type": "string"
},
"workshopGroup": {
"description": "杞︾粍",
"type": "integer"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚嶇О",
+ "type": "string"
}
}
},
@@ -3448,6 +3539,9 @@
"request.GetAttendanceStatistic": {
"type": "object",
"properties": {
+ "keyword": {
+ "type": "string"
+ },
"month": {
"description": "鏈堜唤",
"type": "string"
@@ -3668,6 +3762,67 @@
}
}
},
+ "request.TemplateCategoryRequest": {
+ "type": "object",
+ "properties": {
+ "category": {
+ "$ref": "#/definitions/constvar.FileTemplateCategory"
+ }
+ }
+ },
+ "request.UpdateAttendance": {
+ "type": "object",
+ "properties": {
+ "classes": {
+ "description": "鐝",
+ "type": "string"
+ },
+ "classesEndTime": {
+ "description": "鐝涓嬬彮鏃堕棿",
+ "type": "string"
+ },
+ "classesStartTime": {
+ "description": "鐝寮�濮嬫椂闂�",
+ "type": "string"
+ },
+ "date": {
+ "description": "鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkTime": {
+ "description": "涓嬬彮鎵撳崱鏃堕棿",
+ "type": "string"
+ },
+ "overTimeDuration": {
+ "description": "鍔犵彮鏃堕暱",
+ "type": "number"
+ },
+ "startWorkTime": {
+ "description": "涓婄彮鎵撳崱鏃堕棿",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.AttendanceStatus"
+ }
+ ]
+ },
+ "workTypeId": {
+ "description": "宸ョid",
+ "type": "integer"
+ },
+ "workerId": {
+ "description": "浜哄憳id",
+ "type": "string"
+ },
+ "workerName": {
+ "description": "浜哄憳濮撳悕",
+ "type": "string"
+ }
+ }
+ },
"request.UpdateDict": {
"type": "object",
"properties": {
@@ -3725,7 +3880,8 @@
"startWorkerPosition",
"workerId",
"workshop",
- "workshopGroup"
+ "workshopGroup",
+ "workshopName"
],
"properties": {
"endDate": {
@@ -3752,12 +3908,16 @@
"type": "string"
},
"workshop": {
- "description": "杞﹂棿",
+ "description": "杞﹂棿缂栧彿",
"type": "string"
},
"workshopGroup": {
"description": "杞︾粍",
"type": "integer"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚嶇О",
+ "type": "string"
}
}
},
@@ -3961,9 +4121,29 @@
"response.AttendanceDetail": {
"type": "object",
"properties": {
+ "classes": {
+ "description": "鐝",
+ "type": "string"
+ },
+ "classesEndTime": {
+ "description": "鐝涓嬬彮鏃堕棿",
+ "type": "string"
+ },
+ "classesStartTime": {
+ "description": "鐝寮�濮嬫椂闂�",
+ "type": "string"
+ },
"date": {
"description": "鏃ユ湡",
"type": "integer"
+ },
+ "endWorkTime": {
+ "description": "涓嬬彮鎵撳崱鏃堕棿",
+ "type": "string"
+ },
+ "startWorkTime": {
+ "description": "涓婄彮鎵撳崱鏃堕棿",
+ "type": "string"
},
"status": {
"description": "鐘舵��",
@@ -3972,6 +4152,10 @@
"$ref": "#/definitions/constvar.AttendanceStatus"
}
]
+ },
+ "weekDay": {
+ "description": "鏄熸湡",
+ "type": "string"
}
}
},
@@ -4020,6 +4204,10 @@
"description": "宸ョ",
"type": "string"
},
+ "workTypeId": {
+ "description": "宸ョid",
+ "type": "integer"
+ },
"workerId": {
"description": "浜哄憳id",
"type": "string"
--
Gitblit v1.8.0