From 52d6ec2b86005444441a7c7033d7d2ffd35631d2 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 30 四月 2024 09:58:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer
---
docs/docs.go | 157 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 143 insertions(+), 14 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index f4e0312..2a40518 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -201,6 +201,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": [
@@ -369,7 +399,7 @@
}
}
},
- "post": {
+ "put": {
"produces": [
"application/json"
],
@@ -379,13 +409,20 @@
"summary": "绾ゅ害妫�楠屼慨鏀�",
"parameters": [
{
- "description": "瀛楀吀淇℃伅",
+ "description": "鍙傛暟",
"name": "object",
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/models.FinenessCheck"
+ "$ref": "#/definitions/response.FinenessCheckInfo"
}
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
@@ -2314,6 +2351,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": [
@@ -2324,9 +2376,12 @@
5,
6,
7,
- 8
+ 8,
+ 9,
+ 10
],
"x-enum-comments": {
+ "Absenteeism": "缂哄嫟",
"EarlyWarningDay": "棰勮澶╂暟",
"InspectionWayType": "璐ㄦ鏂瑰紡绫诲瀷",
"MiniDictTypeBomVersionType": "Bom鐗堟湰绫诲瀷",
@@ -2334,7 +2389,8 @@
"OutsourcingSupplierCreditGrade": "淇＄敤绛夌骇",
"OutsourcingSupplierRange": "渚涜揣鑼冨洿",
"OutsourcingSupplierType": "濮斿渚涘簲鍟嗙被鍨�",
- "SalaryType": "鍢夎仈钖祫绫诲瀷"
+ "SalaryType": "鍢夎仈钖祫绫诲瀷",
+ "WildSilk": "閲庣氦"
},
"x-enum-varnames": [
"MiniDictTypePlcBrand",
@@ -2344,7 +2400,9 @@
"OutsourcingSupplierType",
"OutsourcingSupplierCreditGrade",
"OutsourcingSupplierRange",
- "SalaryType"
+ "SalaryType",
+ "WildSilk",
+ "Absenteeism"
]
},
"constvar.WorkerStatus": {
@@ -2708,10 +2766,6 @@
"description": "搴勫彛",
"type": "string"
},
- "name": {
- "description": "杞﹂棿",
- "type": "string"
- },
"number": {
"description": "缂栧彿",
"type": "string"
@@ -2740,6 +2794,12 @@
"workshopGroup": {
"description": "杞︾粍",
"type": "integer"
+ },
+ "workshopName": {
+ "type": "string"
+ },
+ "workshopNumber": {
+ "type": "string"
}
}
},
@@ -3314,10 +3374,6 @@
"description": "搴勫彛",
"type": "string"
},
- "name": {
- "description": "杞﹂棿",
- "type": "string"
- },
"number": {
"description": "缂栧彿",
"type": "string"
@@ -3345,6 +3401,12 @@
"workshopGroup": {
"description": "杞︾粍",
"type": "integer"
+ },
+ "workshopName": {
+ "type": "string"
+ },
+ "workshopNumber": {
+ "type": "string"
}
}
},
@@ -3506,6 +3568,9 @@
"request.GetAttendanceStatistic": {
"type": "object",
"properties": {
+ "keyword": {
+ "type": "string"
+ },
"month": {
"description": "鏈堜唤",
"type": "string"
@@ -3726,16 +3791,44 @@
}
}
},
+ "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": "鐘舵��",
@@ -3745,8 +3838,16 @@
}
]
},
+ "workTypeId": {
+ "description": "宸ョid",
+ "type": "integer"
+ },
"workerId": {
"description": "浜哄憳id",
+ "type": "string"
+ },
+ "workerName": {
+ "description": "浜哄憳濮撳悕",
"type": "string"
}
}
@@ -4049,9 +4150,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": "鐘舵��",
@@ -4060,6 +4181,10 @@
"$ref": "#/definitions/constvar.AttendanceStatus"
}
]
+ },
+ "weekDay": {
+ "description": "鏄熸湡",
+ "type": "string"
}
}
},
@@ -4108,6 +4233,10 @@
"description": "宸ョ",
"type": "string"
},
+ "workTypeId": {
+ "description": "宸ョid",
+ "type": "integer"
+ },
"workerId": {
"description": "浜哄憳id",
"type": "string"
--
Gitblit v1.8.0