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.yaml | 142 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 136 insertions(+), 6 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index dd37dc9..2f13f68 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -67,6 +67,17 @@ - DictTypeWorkshop - DictTypeColor - DictTypeSpec + constvar.FileTemplateCategory: + enum: + - 1 + - 2 + type: integer + x-enum-comments: + FileTemplateCategory_Output: 鍑哄簱 + FileTemplateCategory_Selfmade: 鍏ュ簱-鑷埗 + x-enum-varnames: + - FileTemplateCategory_Selfmade + - FileTemplateCategory_Output constvar.MiniDictType: enum: - 1 @@ -535,9 +546,6 @@ type: integer id: type: integer - name: - description: 杞﹂棿 - type: string startDate: description: 寮�濮嬫棩鏈� type: string @@ -553,9 +561,15 @@ workerId: description: 宸ヤ汉ID type: string + workshop: + description: 杞﹂棿缂栧彿 + type: string workshopGroup: description: 杞︾粍 type: integer + workshopName: + description: 杞﹂棿鍚嶇О + type: string type: object models.WorkshopManage: properties: @@ -803,11 +817,14 @@ description: 宸ヤ汉ID type: string workshop: - description: 杞﹂棿 + description: 杞﹂棿缂栧彿 type: string workshopGroup: description: 杞︾粍 type: integer + workshopName: + description: 杞﹂棿鍚嶇О + type: string required: - endDate - endWorkerPosition @@ -816,6 +833,7 @@ - workerId - workshop - workshopGroup + - workshopName type: object request.ChangeYieldRegister: properties: @@ -883,6 +901,8 @@ type: object request.GetAttendanceStatistic: properties: + keyword: + type: string month: description: 鏈堜唤 type: string @@ -1031,6 +1051,48 @@ $ref: '#/definitions/request.RankStandard' type: array type: object + request.TemplateCategoryRequest: + properties: + category: + $ref: '#/definitions/constvar.FileTemplateCategory' + type: object + request.UpdateAttendance: + 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: + allOf: + - $ref: '#/definitions/constvar.AttendanceStatus' + description: 鐘舵�� + workTypeId: + description: 宸ョid + type: integer + workerId: + description: 浜哄憳id + type: string + workerName: + description: 浜哄憳濮撳悕 + type: string + type: object request.UpdateDict: properties: dictType: @@ -1083,11 +1145,14 @@ description: 宸ヤ汉ID type: string workshop: - description: 杞﹂棿 + description: 杞﹂棿缂栧彿 type: string workshopGroup: description: 杞︾粍 type: integer + workshopName: + description: 杞﹂棿鍚嶇О + type: string required: - endDate - endWorkerPosition @@ -1096,6 +1161,7 @@ - workerId - workshop - workshopGroup + - workshopName type: object request.YieldRegisterCircleInfo: properties: @@ -1243,13 +1309,31 @@ type: object response.AttendanceDetail: 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: allOf: - $ref: '#/definitions/constvar.AttendanceStatus' description: 鐘舵�� + weekDay: + description: 鏄熸湡 + type: string type: object response.AttendanceList: properties: @@ -1283,6 +1367,9 @@ workType: description: 宸ョ type: string + workTypeId: + description: 宸ョid + type: integer workerId: description: 浜哄憳id type: string @@ -1489,6 +1576,25 @@ summary: 鑾峰彇鑰冨嫟缁熻 tags: - 鑰冨嫟绠$悊 + /api-jl/v1/attendance/getTemplate: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.TemplateCategoryRequest' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 鑾峰彇妯$増鍒楄〃 + tags: + - 鑰冨嫟绠$悊 /api-jl/v1/attendance/saveAttendanceRule: post: parameters: @@ -1511,6 +1617,30 @@ schema: $ref: '#/definitions/util.Response' summary: 淇濆瓨鍔犵彮瑙勫垯 + tags: + - 鑰冨嫟绠$悊 + /api-jl/v1/attendance/updateAttendance: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.UpdateAttendance' + - description: token + in: header + name: Authorization + required: true + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 鏇存柊鑰冨嫟 tags: - 鑰冨嫟绠$悊 /api-jl/v1/fineness/changeYieldRegister: @@ -2342,7 +2472,7 @@ tags: - 绯荤粺璁剧疆/杞﹂棿绠$悊 /api-jl/v1/system/getWorkshopManageList: - get: + post: parameters: - description: token in: header -- Gitblit v1.8.0