From 3032034d254fc15f06a1d4260f35c49f0ef1e12f Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期五, 02 八月 2024 11:57:33 +0800
Subject: [PATCH] 添加接口，添加新的薪资查询和修改接口
---
docs/docs.go | 197 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 185 insertions(+), 12 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 14b0afe..3f8e9e3 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1136,6 +1136,89 @@
}
}
},
+ "/api-jl/v1/salary/getPayrollConstituteList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍛樺伐钖祫/钖叕鏂规"
+ ],
+ "summary": "鑾峰彇浜哄憳姣忔湀鐨勮柂璧勫垪琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "缁熻鍛ㄦ湡鎸夋湀鏌ヨ锛堝勾-鏈堬級",
+ "name": "cycle",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "鍏抽敭瀛�",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "宸ョ缂栫爜",
+ "name": "workTypeCode",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "宸ョID",
+ "name": "workTypeID",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "鍛樺伐ID",
+ "name": "workerID",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": true
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/salary/getPayrollProductionCarList": {
"get": {
"produces": [
@@ -1505,6 +1588,43 @@
}
}
},
+ "/api-jl/v1/salary/savePayrollConstitute": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍛樺伐钖祫/钖叕鏂规"
+ ],
+ "summary": "钖叕鏁伴璋冩暣",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SavePayrollConstitute"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/salary/saveSalaryPlan": {
"post": {
"produces": [
@@ -1650,23 +1770,20 @@
1,
2,
3,
- 4,
- 5
+ 4
],
"type": "integer",
"x-enum-comments": {
"DictTypeColor": "棰滆壊",
"DictTypeMarket": "搴勫彛",
"DictTypeSpec": "瑙勬牸",
- "DictTypeSubsidy": "琛ヨ创",
"DictTypeWorkshop": "杞﹂棿"
},
"x-enum-varnames": [
"DictTypeMarket",
"DictTypeWorkshop",
"DictTypeColor",
- "DictTypeSpec",
- "DictTypeSubsidy"
+ "DictTypeSpec"
],
"description": "瀛楀吀绫诲瀷",
"name": "dictType",
@@ -2790,22 +2907,19 @@
1,
2,
3,
- 4,
- 5
+ 4
],
"x-enum-comments": {
"DictTypeColor": "棰滆壊",
"DictTypeMarket": "搴勫彛",
"DictTypeSpec": "瑙勬牸",
- "DictTypeSubsidy": "琛ヨ创",
"DictTypeWorkshop": "杞﹂棿"
},
"x-enum-varnames": [
"DictTypeMarket",
"DictTypeWorkshop",
"DictTypeColor",
- "DictTypeSpec",
- "DictTypeSubsidy"
+ "DictTypeSpec"
]
},
"constvar.FileTemplateCategory": {
@@ -2835,7 +2949,9 @@
"cleaner",
"machine_cleaner",
"all-powerful",
- "monitor"
+ "monitor",
+ "test",
+ "other"
],
"x-enum-comments": {
"JobTypeAllPowerful": "鍏ㄨ兘鏈哄姩",
@@ -2845,7 +2961,9 @@
"JobTypeMachineCleaner": "鎰熺煡鍣ㄦ竻娲楀伐",
"JobTypeMaintenance": "淇濆叏宸�",
"JobTypeMonitor": "鐝暱",
+ "JobTypeOther": "鍏跺畠",
"JobTypeScoop": "鑸�鑼у伐",
+ "JobTypeTest": "娴嬭瘯",
"JobTypeTransport": "閫佽導宸�",
"JobTypeWeavers": "鎸¤溅宸�"
},
@@ -2859,7 +2977,9 @@
"JobTypeCleaner",
"JobTypeMachineCleaner",
"JobTypeAllPowerful",
- "JobTypeMonitor"
+ "JobTypeMonitor",
+ "JobTypeTest",
+ "JobTypeOther"
]
},
"constvar.MiniDictType": {
@@ -3404,6 +3524,10 @@
"models.PayrollProductionCar": {
"type": "object",
"properties": {
+ "badSilkAvgQuantity": {
+ "description": "閲庣氦骞冲潎鏁伴噺",
+ "type": "number"
+ },
"badSilkQuantity": {
"description": "閲庣氦鏁伴噺",
"type": "number"
@@ -3503,6 +3627,9 @@
"description": "瑙勬牸",
"type": "string"
},
+ "workshopId": {
+ "type": "integer"
+ },
"workshopNumber": {
"description": "杞﹂棿缂栧彿",
"type": "string"
@@ -3561,6 +3688,9 @@
"silkTotalAvgAmount": {
"description": "涓濋噺浜哄钩鍧囨�讳环",
"type": "number"
+ },
+ "workshopId": {
+ "type": "integer"
},
"workshopName": {
"description": "杞﹂棿鍚嶇О",
@@ -3836,6 +3966,9 @@
"shopName": {
"type": "string"
},
+ "shopNumber": {
+ "type": "string"
+ },
"status": {
"$ref": "#/definitions/constvar.WorkerStatus"
},
@@ -4080,6 +4213,9 @@
},
"vehicleSpeed": {
"type": "number"
+ },
+ "workshopId": {
+ "type": "integer"
},
"workshopName": {
"description": "杞﹂棿鍚�",
@@ -4711,6 +4847,43 @@
}
}
},
+ "request.SavePayrollConstitute": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "閲戦",
+ "type": "number"
+ },
+ "cycle": {
+ "description": "鍛ㄦ湡锛堟湀浠斤級",
+ "type": "string"
+ },
+ "salaryPlanId": {
+ "description": "钖祫鏂规ID",
+ "type": "integer"
+ },
+ "workTypeCode": {
+ "description": "宸ョ浠ｇ爜",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.JobType"
+ }
+ ]
+ },
+ "workTypeID": {
+ "description": "宸ョID",
+ "type": "integer"
+ },
+ "workTypeName": {
+ "description": "宸ョ鍚嶇О",
+ "type": "string"
+ },
+ "workerId": {
+ "description": "鍛樺伐ID",
+ "type": "string"
+ }
+ }
+ },
"request.SaveRankStandard": {
"type": "object",
"properties": {
--
Gitblit v1.8.0