From 1bd58eb901da8ca32d15c121effa7e22cc89e1bd Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期四, 25 七月 2024 11:47:12 +0800
Subject: [PATCH] 添加功能，工资计算（根据历史工资excel给定的规则进行编写）
---
docs/docs.go | 681 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 674 insertions(+), 7 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index d5e5cd8..14b0afe 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -357,6 +357,12 @@
"summary": "绾ゅ害妫�楠屽垪琛�",
"parameters": [
{
+ "type": "integer",
+ "description": "绾ゅ害鐧昏琛↖D",
+ "name": "finenessRegisterID",
+ "in": "query"
+ },
+ {
"type": "string",
"name": "keyword",
"in": "query"
@@ -446,7 +452,7 @@
"parameters": [
{
"type": "string",
- "description": "瀛楀吀淇℃伅",
+ "description": "绾ゅ害妫�楠孖D",
"name": "id",
"in": "path",
"required": true
@@ -495,6 +501,46 @@
"description": "鎴愬姛",
"schema": {
"$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/fineness/checkFinenessID/{id}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害妫�楠�"
+ ],
+ "summary": "鏍规嵁绾ゅ害鐧昏ID鑾峰彇绾ゅ害妫�楠岃鎯�",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "绾ゅ害鐧昏ID",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.FinenessCheckInfo"
+ }
+ }
+ }
+ ]
}
}
}
@@ -625,6 +671,12 @@
],
"summary": "绾ゅ害鐧昏鍒楄〃",
"parameters": [
+ {
+ "type": "integer",
+ "description": "绾ゅ害鐧昏琛↖D",
+ "name": "finenessRegisterID",
+ "in": "query"
+ },
{
"type": "string",
"name": "keyword",
@@ -1084,6 +1136,273 @@
}
}
},
+ "/api-jl/v1/salary/getPayrollProductionCarList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍛樺伐钖祫/钖叕鏂规"
+ ],
+ "summary": "鑾峰彇杞﹀彴姣忓ぉ鐨勪骇閲忓垪琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "integer",
+ "description": "杞﹀彴鍙�",
+ "name": "carNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "缁熻鍛ㄦ湡锛堝勾-鏈�-鏃ワ級",
+ "name": "cycle",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "绛夌骇",
+ "name": "finishLevel",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "缁勫埆",
+ "name": "groupNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "搴勫彛缂栧彿",
+ "name": "marketNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "缁熻鍛ㄦ湡鎸夋湀鏌ヨ锛堝勾-鏈堬級",
+ "name": "monthly",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "瑙勬牸",
+ "name": "spec",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "杞﹂棿缂栧彿",
+ "name": "workshopNumber",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.PayrollProductionCar"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/salary/getPayrollProductionGroupList": {
+ "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": "integer",
+ "description": "缁勫埆",
+ "name": "groupNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "缁熻鍛ㄦ湡鎸夋湀鏌ヨ锛堝勾-鏈堬級",
+ "name": "monthly",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "杞﹂棿缂栧彿",
+ "name": "workshopNumber",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.PayrollProductionGroup"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/salary/getPayrollSalaryPlanList": {
+ "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": "array",
+ "items": {
+ "$ref": "#/definitions/models.PayrollSalaryPlan"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/salary/getSalaryPlanList": {
"post": {
"produces": [
@@ -1328,23 +1647,26 @@
"parameters": [
{
"enum": [
- 0,
1,
2,
- 3
+ 3,
+ 4,
+ 5
],
"type": "integer",
"x-enum-comments": {
"DictTypeColor": "棰滆壊",
"DictTypeMarket": "搴勫彛",
"DictTypeSpec": "瑙勬牸",
+ "DictTypeSubsidy": "琛ヨ创",
"DictTypeWorkshop": "杞﹂棿"
},
"x-enum-varnames": [
"DictTypeMarket",
"DictTypeWorkshop",
"DictTypeColor",
- "DictTypeSpec"
+ "DictTypeSpec",
+ "DictTypeSubsidy"
],
"description": "瀛楀吀绫诲瀷",
"name": "dictType",
@@ -2465,22 +2787,25 @@
"constvar.DictType": {
"type": "integer",
"enum": [
- 0,
1,
2,
- 3
+ 3,
+ 4,
+ 5
],
"x-enum-comments": {
"DictTypeColor": "棰滆壊",
"DictTypeMarket": "搴勫彛",
"DictTypeSpec": "瑙勬牸",
+ "DictTypeSubsidy": "琛ヨ创",
"DictTypeWorkshop": "杞﹂棿"
},
"x-enum-varnames": [
"DictTypeMarket",
"DictTypeWorkshop",
"DictTypeColor",
- "DictTypeSpec"
+ "DictTypeSpec",
+ "DictTypeSubsidy"
]
},
"constvar.FileTemplateCategory": {
@@ -2496,6 +2821,45 @@
"x-enum-varnames": [
"FileTemplateCategory_Selfmade",
"FileTemplateCategory_Output"
+ ]
+ },
+ "constvar.JobType": {
+ "type": "string",
+ "enum": [
+ "weavers",
+ "car_head",
+ "maintenance",
+ "boiled",
+ "scoop",
+ "transport",
+ "cleaner",
+ "machine_cleaner",
+ "all-powerful",
+ "monitor"
+ ],
+ "x-enum-comments": {
+ "JobTypeAllPowerful": "鍏ㄨ兘鏈哄姩",
+ "JobTypeBoiled": "鐓導宸�",
+ "JobTypeCarHead": "杞﹀ご宸�",
+ "JobTypeCleaner": "娓呮磥宸�",
+ "JobTypeMachineCleaner": "鎰熺煡鍣ㄦ竻娲楀伐",
+ "JobTypeMaintenance": "淇濆叏宸�",
+ "JobTypeMonitor": "鐝暱",
+ "JobTypeScoop": "鑸�鑼у伐",
+ "JobTypeTransport": "閫佽導宸�",
+ "JobTypeWeavers": "鎸¤溅宸�"
+ },
+ "x-enum-varnames": [
+ "JobTypeWeavers",
+ "JobTypeCarHead",
+ "JobTypeMaintenance",
+ "JobTypeBoiled",
+ "JobTypeScoop",
+ "JobTypeTransport",
+ "JobTypeCleaner",
+ "JobTypeMachineCleaner",
+ "JobTypeAllPowerful",
+ "JobTypeMonitor"
]
},
"constvar.MiniDictType": {
@@ -2860,6 +3224,7 @@
"type": "number"
},
"finenessRegisterID": {
+ "description": "绾ゅ害鐧昏ID",
"type": "integer"
},
"id": {
@@ -2915,6 +3280,10 @@
"market": {
"description": "搴勫彛鍚嶇О",
"type": "string"
+ },
+ "marketId": {
+ "description": "搴勫彛ID",
+ "type": "integer"
},
"marketNumber": {
"description": "搴勫彛缂栧彿",
@@ -3032,6 +3401,287 @@
}
}
},
+ "models.PayrollProductionCar": {
+ "type": "object",
+ "properties": {
+ "badSilkQuantity": {
+ "description": "閲庣氦鏁伴噺",
+ "type": "number"
+ },
+ "badSilkTotalAmount": {
+ "description": "閲庣氦鎬讳环",
+ "type": "number"
+ },
+ "badSilkTotalAvgAmount": {
+ "description": "閲庣氦浜哄钩鍧囨�讳环",
+ "type": "number"
+ },
+ "badSilkType": {
+ "description": "閲庣氦绫诲瀷",
+ "type": "string"
+ },
+ "badSilkUnitAmount": {
+ "description": "閲庣氦鍗曚环",
+ "type": "number"
+ },
+ "carNumber": {
+ "description": "杞﹀彴鍙�",
+ "type": "integer"
+ },
+ "carWorkIds": {
+ "description": "杞﹀彴鍏宠仈鎸¤溅宸D",
+ "type": "string"
+ },
+ "carWorkQuantity": {
+ "description": "杞﹀彴鍏宠仈浜哄憳鏁伴噺",
+ "type": "integer"
+ },
+ "cycle": {
+ "description": "缁熻鍛ㄦ湡锛堝勾鏈堟棩锛�",
+ "type": "string"
+ },
+ "desiredLevel": {
+ "description": "鏈熸湜绛夌骇",
+ "type": "string"
+ },
+ "fallingSilkBucket": {
+ "description": "钀戒笣妗舵暟",
+ "type": "number"
+ },
+ "finishLevel": {
+ "description": "鎴愬搧绛夌骇",
+ "type": "string"
+ },
+ "finishTotalAmount": {
+ "description": "鎴愬搧閲戦",
+ "type": "number"
+ },
+ "finishTotalAvgAmount": {
+ "description": "鎴愬搧浜哄钩鍧囬噾棰�",
+ "type": "number"
+ },
+ "groupNumber": {
+ "description": "缁勫埆",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "marketId": {
+ "description": "搴勫彛缂栧彿",
+ "type": "integer"
+ },
+ "marketName": {
+ "description": "搴勫彛鍚嶇О",
+ "type": "string"
+ },
+ "marketNumber": {
+ "description": "搴勫彛缂栧彿",
+ "type": "string"
+ },
+ "silkAvgQuantity": {
+ "description": "浜哄钩鍧囦笣閲�",
+ "type": "number"
+ },
+ "silkQuantity": {
+ "description": "涓濋噺",
+ "type": "number"
+ },
+ "silkTotalAmount": {
+ "description": "涓濋噺鎬讳环",
+ "type": "number"
+ },
+ "silkTotalAvgAmount": {
+ "description": "涓濋噺浜哄钩鍧囨�讳环",
+ "type": "number"
+ },
+ "silkUnitAmount": {
+ "description": "涓濆崟浠�",
+ "type": "number"
+ },
+ "spec": {
+ "description": "瑙勬牸",
+ "type": "string"
+ },
+ "workshopNumber": {
+ "description": "杞﹂棿缂栧彿",
+ "type": "string"
+ }
+ }
+ },
+ "models.PayrollProductionGroup": {
+ "type": "object",
+ "properties": {
+ "badSilkQuantity": {
+ "description": "閲庣氦鏁伴噺",
+ "type": "number"
+ },
+ "badSilkTotalAmount": {
+ "description": "閲庣氦鎬讳环",
+ "type": "number"
+ },
+ "badSilkTotalAvgAmount": {
+ "description": "閲庣氦浜哄钩鍧囨�讳环",
+ "type": "number"
+ },
+ "cycle": {
+ "description": "缁熻鍛ㄦ湡锛堝勾鏈堟棩锛�",
+ "type": "string"
+ },
+ "fallingSilkBucket": {
+ "type": "number"
+ },
+ "finishTotalAmount": {
+ "description": "鎴愬搧閲戦",
+ "type": "number"
+ },
+ "finishTotalAvgAmount": {
+ "description": "鎴愬搧浜哄钩鍧囬噾棰�",
+ "type": "number"
+ },
+ "groupNumber": {
+ "description": "缁勫埆",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "silkAvgQuantity": {
+ "description": "浜哄钩鍧囦笣閲�",
+ "type": "number"
+ },
+ "silkQuantity": {
+ "description": "涓濋噺",
+ "type": "number"
+ },
+ "silkTotalAmount": {
+ "description": "涓濋噺鎬讳环",
+ "type": "number"
+ },
+ "silkTotalAvgAmount": {
+ "description": "涓濋噺浜哄钩鍧囨�讳环",
+ "type": "number"
+ },
+ "workshopName": {
+ "description": "杞﹂棿鍚嶇О",
+ "type": "string"
+ },
+ "workshopNumber": {
+ "description": "杞﹂棿缂栧彿",
+ "type": "string"
+ }
+ }
+ },
+ "models.PayrollSalaryPlan": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "搴斿彂宸ヨ祫",
+ "type": "number"
+ },
+ "baseSalaryAmount": {
+ "description": "涓嶈揪淇濆簳",
+ "type": "number"
+ },
+ "cycle": {
+ "description": "鏈堜唤",
+ "type": "string"
+ },
+ "dailyInspectionAmount": {
+ "description": "鏃ュ父妫�鏌�/濂栫綒3",
+ "type": "number"
+ },
+ "downtimeAmount": {
+ "description": "鍋滄満琛ヨ创",
+ "type": "number"
+ },
+ "heatAmount": {
+ "description": "濂栫綒2/娓呭噳琛ヨ创",
+ "type": "number"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "longTermAmount": {
+ "description": "婊″嫟",
+ "type": "number"
+ },
+ "masterApprenticeAmount": {
+ "description": "甯﹀緬琛ヨ创",
+ "type": "number"
+ },
+ "overtimeAmount": {
+ "description": "鍔犵彮宸ヨ祫",
+ "type": "number"
+ },
+ "positionAmount": {
+ "description": "宀椾綅琛ヨ创",
+ "type": "number"
+ },
+ "productionAmount": {
+ "description": "鐢熶骇宸ヨ祫",
+ "type": "number"
+ },
+ "qualityStandardsAmount": {
+ "description": "璐ㄩ噺濂�",
+ "type": "number"
+ },
+ "quantity": {
+ "description": "浜ч噺",
+ "type": "number"
+ },
+ "remark": {
+ "description": "澶囨敞",
+ "type": "string"
+ },
+ "seniorityAmount": {
+ "description": "宸ラ緞琛ヨ创",
+ "type": "number"
+ },
+ "socialSecurityAmount": {
+ "description": "绀句繚琛ヨ创",
+ "type": "number"
+ },
+ "substandardQualityAmount": {
+ "description": "濂栫綒1",
+ "type": "number"
+ },
+ "timeoutAmount": {
+ "description": "瓒呮椂宸ヨ祫",
+ "type": "number"
+ },
+ "trafficAmount": {
+ "description": "浜ら�氳ˉ璐�",
+ "type": "number"
+ },
+ "workTypeCode": {
+ "description": "宸ョ浠ｇ爜",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.JobType"
+ }
+ ]
+ },
+ "workTypeID": {
+ "description": "宸ョID",
+ "type": "integer"
+ },
+ "workTypeName": {
+ "description": "宸ョ鍚嶇О",
+ "type": "string"
+ },
+ "worker": {
+ "$ref": "#/definitions/models.Worker"
+ },
+ "workerId": {
+ "description": "鍛樺伐ID",
+ "type": "string"
+ },
+ "workerName": {
+ "type": "string"
+ }
+ }
+ },
"models.RawSilkPriceStandard": {
"type": "object",
"properties": {
@@ -3048,6 +3698,9 @@
"type": "integer"
},
"marketName": {
+ "type": "string"
+ },
+ "marketNumber": {
"type": "string"
},
"notes": {
@@ -3118,6 +3771,9 @@
"addPeople": {
"type": "string"
},
+ "code": {
+ "$ref": "#/definitions/constvar.JobType"
+ },
"createTime": {
"type": "string"
},
@@ -3185,6 +3841,9 @@
},
"workType": {
"type": "string"
+ },
+ "workTypeCode": {
+ "$ref": "#/definitions/constvar.JobType"
},
"workTypeId": {
"type": "integer"
@@ -3371,6 +4030,10 @@
},
"marketName": {
"description": "搴勫彛鍚�",
+ "type": "string"
+ },
+ "marketNumber": {
+ "description": "搴勫彛缂栧彿",
"type": "string"
},
"number": {
@@ -4341,6 +5004,10 @@
"description": "搴勫彛id",
"type": "integer"
},
+ "marketNumber": {
+ "description": "搴勫彛缂栧彿",
+ "type": "string"
+ },
"number": {
"description": "缂栧彿",
"type": "string"
--
Gitblit v1.8.0