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 | 770 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 768 insertions(+), 2 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index d5a3066..2e1c8b7 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -112,6 +112,187 @@
}
}
},
+ "/api-jl/v1/attendance/getAttendanceRule": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鑰冨嫟绠＄悊"
+ ],
+ "summary": "鑾峰彇鍔犵彮瑙勫垯",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/attendance/getAttendanceStatistic": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鑰冨嫟绠＄悊"
+ ],
+ "summary": "鑾峰彇鑰冨嫟缁熻",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetAttendanceStatistic"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.AttendanceList"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/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": [
+ "application/json"
+ ],
+ "tags": [
+ "鑰冨嫟绠＄悊"
+ ],
+ "summary": "淇濆瓨鍔犵彮瑙勫垯",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "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"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/fineness/changeYieldRegister": {
"post": {
"produces": [
@@ -1463,7 +1644,7 @@
}
},
"/api-jl/v1/system/getWorkshopManageList": {
- "get": {
+ "post": {
"produces": [
"application/json"
],
@@ -1903,9 +2084,191 @@
}
}
}
+ },
+ "/api-jl/v1/workerPosition/createWorkerPositionInfo": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鍒涘缓鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWorkPositionRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/deleteWorkerPositionInfo/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鍒犻櫎鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/getWorkerPositionList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鑾峰彇鏈哄彴淇℃伅鍒楄〃",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetWorkerPositionList"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WorkerPosition"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/workerPosition/updateWorkerPositionInfo": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈哄彴绠＄悊"
+ ],
+ "summary": "鏇存柊鏈哄彴淇℃伅",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateWorkerPositionRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
}
},
"definitions": {
+ "constvar.AttendanceStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3,
+ 4
+ ],
+ "x-enum-comments": {
+ "Abnormal": "寮傚父",
+ "Normal": "姝ｅ父",
+ "Overtime": "鍔犵彮",
+ "Vacation": "浼戝亣"
+ },
+ "x-enum-varnames": [
+ "Normal",
+ "Overtime",
+ "Vacation",
+ "Abnormal"
+ ]
+ },
"constvar.CarFlag": {
"type": "integer",
"enum": [
@@ -1967,6 +2330,21 @@
"DictTypeWorkshop",
"DictTypeColor",
"DictTypeSpec"
+ ]
+ },
+ "constvar.FileTemplateCategory": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "FileTemplateCategory_Output": "鍑哄簱",
+ "FileTemplateCategory_Selfmade": "鍏ュ簱-鑷埗"
+ },
+ "x-enum-varnames": [
+ "FileTemplateCategory_Selfmade",
+ "FileTemplateCategory_Output"
]
},
"constvar.MiniDictType": {
@@ -2068,17 +2446,58 @@
"id": {
"type": "integer"
},
+ "overTimeDuration": {
+ "type": "number"
+ },
"startWorkTime": {
"type": "string"
},
+ "status": {
+ "$ref": "#/definitions/constvar.AttendanceStatus"
+ },
"updatedAt": {
"type": "string"
+ },
+ "workType": {
+ "$ref": "#/definitions/models.WorkTypeManage"
+ },
+ "workTypeId": {
+ "type": "integer"
},
"workerId": {
"type": "string"
},
"workerName": {
"type": "string"
+ }
+ }
+ },
+ "models.AttendanceRule": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "overTimeStart": {
+ "type": "number"
+ },
+ "restDayRule": {
+ "type": "integer"
+ },
+ "restDayStart": {
+ "type": "number"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "weekdayRule": {
+ "type": "integer"
}
}
},
@@ -2397,7 +2816,7 @@
"type": "string"
},
"worker": {
- "description": "宸ヤ汉ID",
+ "description": "宸ヤ汉",
"allOf": [
{
"$ref": "#/definitions/models.Worker"
@@ -2579,6 +2998,66 @@
},
"workTypeId": {
"type": "integer"
+ }
+ }
+ },
+ "models.WorkerPosition": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "creator": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "worker": {
+ "description": "宸ヤ汉",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Worker"
+ }
+ ]
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshop": {
+ "description": "杞﹂棿缂栧彿",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "integer"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚嶇О",
+ "type": "string"
}
}
},
@@ -2919,6 +3398,53 @@
}
}
},
+ "request.AddWorkPositionRequest": {
+ "type": "object",
+ "required": [
+ "endDate",
+ "endWorkerPosition",
+ "startDate",
+ "startWorkerPosition",
+ "workerId",
+ "workshop",
+ "workshopGroup",
+ "workshopName"
+ ],
+ "properties": {
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshop": {
+ "description": "杞﹂棿缂栧彿",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "integer"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚嶇О",
+ "type": "string"
+ }
+ }
+ },
"request.ChangeYieldRegister": {
"type": "object",
"properties": {
@@ -2948,6 +3474,7 @@
"type": "object",
"properties": {
"ids": {
+ "description": "璁板綍id",
"type": "array",
"items": {
"type": "integer"
@@ -3009,6 +3536,18 @@
}
}
},
+ "request.GetAttendanceStatistic": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "month": {
+ "description": "鏈堜唤",
+ "type": "string"
+ }
+ }
+ },
"request.GetMentorList": {
"type": "object",
"properties": {
@@ -3058,6 +3597,22 @@
}
},
"request.GetWorkerList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
+ "request.GetWorkerPositionList": {
"type": "object",
"properties": {
"keyword": {
@@ -3207,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": {
@@ -3251,6 +3867,56 @@
},
"workerId": {
"description": "宸ヤ汉ID",
+ "type": "string"
+ }
+ }
+ },
+ "request.UpdateWorkerPositionRequest": {
+ "type": "object",
+ "required": [
+ "endDate",
+ "endWorkerPosition",
+ "startDate",
+ "startWorkerPosition",
+ "workerId",
+ "workshop",
+ "workshopGroup",
+ "workshopName"
+ ],
+ "properties": {
+ "endDate": {
+ "description": "缁撴潫鏃ユ湡",
+ "type": "string"
+ },
+ "endWorkerPosition": {
+ "description": "缁撴潫杞﹀彿",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "startDate": {
+ "description": "寮�濮嬫棩鏈�",
+ "type": "string"
+ },
+ "startWorkerPosition": {
+ "description": "寮�濮嬭溅鍙�",
+ "type": "integer"
+ },
+ "workerId": {
+ "description": "宸ヤ汉ID",
+ "type": "string"
+ },
+ "workshop": {
+ "description": "杞﹂棿缂栧彿",
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "integer"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚嶇О",
"type": "string"
}
}
@@ -3452,6 +4118,106 @@
}
}
},
+ "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": "鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.AttendanceStatus"
+ }
+ ]
+ },
+ "weekDay": {
+ "description": "鏄熸湡",
+ "type": "string"
+ }
+ }
+ },
+ "response.AttendanceList": {
+ "type": "object",
+ "properties": {
+ "list": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.AttendanceStatistic"
+ }
+ }
+ }
+ },
+ "response.AttendanceStatistic": {
+ "type": "object",
+ "properties": {
+ "actualAttendanceDays": {
+ "description": "瀹為檯鍑哄嫟澶╂暟",
+ "type": "integer"
+ },
+ "details": {
+ "description": "璇︽儏",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.AttendanceDetail"
+ }
+ },
+ "month": {
+ "description": "鏈堜唤",
+ "type": "string"
+ },
+ "requiredAttendanceDays": {
+ "description": "搴斿嚭鍕ゅぉ鏁�",
+ "type": "integer"
+ },
+ "restDayOverTime": {
+ "description": "浼戞伅鏃ュ姞鐝椂闀�",
+ "type": "number"
+ },
+ "weekdayOverTime": {
+ "description": "宸ヤ綔鏃ュ姞鐝椂闀�",
+ "type": "number"
+ },
+ "workType": {
+ "description": "宸ョ",
+ "type": "string"
+ },
+ "workTypeId": {
+ "description": "宸ョid",
+ "type": "integer"
+ },
+ "workerId": {
+ "description": "浜哄憳id",
+ "type": "string"
+ },
+ "workerName": {
+ "description": "浜哄憳濮撳悕",
+ "type": "string"
+ }
+ }
+ },
"response.CarAndLevel": {
"type": "object",
"properties": {
--
Gitblit v1.8.0