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/swagger.yaml | 466 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 463 insertions(+), 3 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index d383d84..5c36380 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -49,21 +49,24 @@
- CheckItemMaxDeviation
constvar.DictType:
enum:
- - 0
- 1
- 2
- 3
+ - 4
+ - 5
type: integer
x-enum-comments:
DictTypeColor: 棰滆壊
DictTypeMarket: 搴勫彛
DictTypeSpec: 瑙勬牸
+ DictTypeSubsidy: 琛ヨ创
DictTypeWorkshop: 杞﹂棿
x-enum-varnames:
- DictTypeMarket
- DictTypeWorkshop
- DictTypeColor
- DictTypeSpec
+ - DictTypeSubsidy
constvar.FileTemplateCategory:
enum:
- 1
@@ -75,6 +78,41 @@
x-enum-varnames:
- FileTemplateCategory_Selfmade
- FileTemplateCategory_Output
+ constvar.JobType:
+ enum:
+ - weavers
+ - car_head
+ - maintenance
+ - boiled
+ - scoop
+ - transport
+ - cleaner
+ - machine_cleaner
+ - all-powerful
+ - monitor
+ type: string
+ 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:
enum:
- 1
@@ -334,6 +372,7 @@
description: 绾ゅ害
type: number
finenessRegisterID:
+ description: 绾ゅ害鐧昏ID
type: integer
id:
type: integer
@@ -373,6 +412,9 @@
market:
description: 搴勫彛鍚嶇О
type: string
+ marketId:
+ description: 搴勫彛ID
+ type: integer
marketNumber:
description: 搴勫彛缂栧彿
type: string
@@ -452,6 +494,211 @@
value:
type: string
type: object
+ models.PayrollProductionCar:
+ 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
+ type: object
+ models.PayrollProductionGroup:
+ 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
+ type: object
+ models.PayrollSalaryPlan:
+ 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:
+ allOf:
+ - $ref: '#/definitions/constvar.JobType'
+ description: 宸ョ浠ｇ爜
+ workTypeID:
+ description: 宸ョID
+ type: integer
+ workTypeName:
+ description: 宸ョ鍚嶇О
+ type: string
+ worker:
+ $ref: '#/definitions/models.Worker'
+ workerId:
+ description: 鍛樺伐ID
+ type: string
+ workerName:
+ type: string
+ type: object
models.RawSilkPriceStandard:
properties:
createdAt:
@@ -463,6 +710,8 @@
marketId:
type: integer
marketName:
+ type: string
+ marketNumber:
type: string
notes:
type: string
@@ -509,6 +758,8 @@
properties:
addPeople:
type: string
+ code:
+ $ref: '#/definitions/constvar.JobType'
createTime:
type: string
createdAt:
@@ -554,6 +805,8 @@
$ref: '#/definitions/constvar.WorkerStatus'
workType:
type: string
+ workTypeCode:
+ $ref: '#/definitions/constvar.JobType'
workTypeId:
type: integer
type: object
@@ -677,6 +930,9 @@
type: integer
marketName:
description: 搴勫彛鍚�
+ type: string
+ marketNumber:
+ description: 搴勫彛缂栧彿
type: string
number:
type: string
@@ -1347,6 +1603,9 @@
marketId:
description: 搴勫彛id
type: integer
+ marketNumber:
+ description: 搴勫彛缂栧彿
+ type: string
number:
description: 缂栧彿
type: string
@@ -1851,6 +2110,10 @@
/api-jl/v1/fineness/check:
get:
parameters:
+ - description: 绾ゅ害鐧昏琛↖D
+ in: query
+ name: finenessRegisterID
+ type: integer
- in: query
name: keyword
type: string
@@ -1922,7 +2185,7 @@
- 绾ゅ害妫�楠�
get:
parameters:
- - description: 瀛楀吀淇℃伅
+ - description: 绾ゅ害妫�楠孖D
in: path
name: id
required: true
@@ -1940,6 +2203,29 @@
$ref: '#/definitions/response.FinenessCheckInfo'
type: object
summary: 绾ゅ害妫�楠岃鎯�
+ tags:
+ - 绾ゅ害妫�楠�
+ /api-jl/v1/fineness/checkFinenessID/{id}:
+ get:
+ parameters:
+ - description: 绾ゅ害鐧昏ID
+ in: path
+ name: id
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ $ref: '#/definitions/response.FinenessCheckInfo'
+ type: object
+ summary: 鏍规嵁绾ゅ害鐧昏ID鑾峰彇绾ゅ害妫�楠岃鎯�
tags:
- 绾ゅ害妫�楠�
/api-jl/v1/fineness/deleteYieldRegister/{number}:
@@ -2013,6 +2299,10 @@
/api-jl/v1/fineness/register:
get:
parameters:
+ - description: 绾ゅ害鐧昏琛↖D
+ in: query
+ name: finenessRegisterID
+ type: integer
- in: query
name: keyword
type: string
@@ -2303,6 +2593,173 @@
summary: 鍒犻櫎钖叕鏂规
tags:
- 鍛樺伐钖祫/钖叕鏂规
+ /api-jl/v1/salary/getPayrollProductionCarList:
+ get:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: 杞﹀彴鍙�
+ in: query
+ name: carNumber
+ type: integer
+ - description: 缁熻鍛ㄦ湡锛堝勾-鏈�-鏃ワ級
+ in: query
+ name: cycle
+ type: string
+ - description: 绛夌骇
+ in: query
+ name: finishLevel
+ type: string
+ - description: 缁勫埆
+ in: query
+ name: groupNumber
+ type: integer
+ - description: 搴勫彛缂栧彿
+ in: query
+ name: marketNumber
+ type: string
+ - description: 缁熻鍛ㄦ湡鎸夋湀鏌ヨ锛堝勾-鏈堬級
+ in: query
+ name: monthly
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - description: 瑙勬牸
+ in: query
+ name: spec
+ type: string
+ - description: 杞﹂棿缂栧彿
+ in: query
+ name: workshopNumber
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.PayrollProductionCar'
+ type: array
+ type: object
+ summary: 鑾峰彇杞﹀彴姣忓ぉ鐨勪骇閲忓垪琛�
+ tags:
+ - 鍛樺伐钖祫/钖叕鏂规
+ /api-jl/v1/salary/getPayrollProductionGroupList:
+ get:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: 缁熻鍛ㄦ湡锛堝勾-鏈�-鏃ワ級
+ in: query
+ name: cycle
+ type: string
+ - description: 缁勫埆
+ in: query
+ name: groupNumber
+ type: integer
+ - description: 缁熻鍛ㄦ湡鎸夋湀鏌ヨ锛堝勾-鏈堬級
+ in: query
+ name: monthly
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - description: 杞﹂棿缂栧彿
+ in: query
+ name: workshopNumber
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.PayrollProductionGroup'
+ type: array
+ type: object
+ summary: 鑾峰彇灏忕粍姣忓ぉ鐨勪骇閲忓垪琛�
+ tags:
+ - 鍛樺伐钖祫/钖叕鏂规
+ /api-jl/v1/salary/getPayrollSalaryPlanList:
+ get:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: 缁熻鍛ㄦ湡鎸夋湀鏌ヨ锛堝勾-鏈堬級
+ in: query
+ name: cycle
+ type: string
+ - description: 鍏抽敭瀛�
+ in: query
+ name: keyword
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - description: 宸ョ缂栫爜
+ in: query
+ name: workTypeCode
+ type: string
+ - description: 宸ョID
+ in: query
+ name: workTypeID
+ type: integer
+ - description: 鍛樺伐ID
+ in: query
+ name: workerID
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.PayrollSalaryPlan'
+ type: array
+ type: object
+ summary: 鑾峰彇浜哄憳姣忔湀鐨勮柂璧勫垪琛�
+ tags:
+ - 鍛樺伐钖祫/钖叕鏂规
/api-jl/v1/salary/getSalaryPlanList:
post:
parameters:
@@ -2453,10 +2910,11 @@
parameters:
- description: 瀛楀吀绫诲瀷
enum:
- - 0
- 1
- 2
- 3
+ - 4
+ - 5
in: query
name: dictType
type: integer
@@ -2464,12 +2922,14 @@
DictTypeColor: 棰滆壊
DictTypeMarket: 搴勫彛
DictTypeSpec: 瑙勬牸
+ DictTypeSubsidy: 琛ヨ创
DictTypeWorkshop: 杞﹂棿
x-enum-varnames:
- DictTypeMarket
- DictTypeWorkshop
- DictTypeColor
- DictTypeSpec
+ - DictTypeSubsidy
- description: 鎼滅储鍏抽敭瀛�
in: query
name: keyword
--
Gitblit v1.8.0