From 3032034d254fc15f06a1d4260f35c49f0ef1e12f Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期五, 02 八月 2024 11:57:33 +0800
Subject: [PATCH] 添加接口，添加新的薪资查询和修改接口

---
 docs/swagger.yaml |  124 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 118 insertions(+), 6 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 5c36380..a3cc964 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -53,20 +53,17 @@
     - 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
@@ -90,6 +87,8 @@
     - machine_cleaner
     - all-powerful
     - monitor
+    - test
+    - other
     type: string
     x-enum-comments:
       JobTypeAllPowerful: 鍏ㄨ兘鏈哄姩
@@ -99,7 +98,9 @@
       JobTypeMachineCleaner: 鎰熺煡鍣ㄦ竻娲楀伐
       JobTypeMaintenance: 淇濆叏宸�
       JobTypeMonitor: 鐝暱
+      JobTypeOther: 鍏跺畠
       JobTypeScoop: 鑸�鑼у伐
+      JobTypeTest: 娴嬭瘯
       JobTypeTransport: 閫佽導宸�
       JobTypeWeavers: 鎸¤溅宸�
     x-enum-varnames:
@@ -113,6 +114,8 @@
     - JobTypeMachineCleaner
     - JobTypeAllPowerful
     - JobTypeMonitor
+    - JobTypeTest
+    - JobTypeOther
   constvar.MiniDictType:
     enum:
     - 1
@@ -496,6 +499,9 @@
     type: object
   models.PayrollProductionCar:
     properties:
+      badSilkAvgQuantity:
+        description: 閲庣氦骞冲潎鏁伴噺
+        type: number
       badSilkQuantity:
         description: 閲庣氦鏁伴噺
         type: number
@@ -570,6 +576,8 @@
       spec:
         description: 瑙勬牸
         type: string
+      workshopId:
+        type: integer
       workshopNumber:
         description: 杞﹂棿缂栧彿
         type: string
@@ -613,6 +621,8 @@
       silkTotalAvgAmount:
         description: 涓濋噺浜哄钩鍧囨�讳环
         type: number
+      workshopId:
+        type: integer
       workshopName:
         description: 杞﹂棿鍚嶇О
         type: string
@@ -801,6 +811,8 @@
         type: string
       shopName:
         type: string
+      shopNumber:
+        type: string
       status:
         $ref: '#/definitions/constvar.WorkerStatus'
       workType:
@@ -964,6 +976,8 @@
         type: string
       vehicleSpeed:
         type: number
+      workshopId:
+        type: integer
       workshopName:
         description: 杞﹂棿鍚�
         type: string
@@ -1394,6 +1408,31 @@
         type: boolean
       name:
         description: 鍚嶇О
+        type: string
+    type: object
+  request.SavePayrollConstitute:
+    properties:
+      amount:
+        description: 閲戦
+        type: number
+      cycle:
+        description: 鍛ㄦ湡锛堟湀浠斤級
+        type: string
+      salaryPlanId:
+        description: 钖祫鏂规ID
+        type: integer
+      workTypeCode:
+        allOf:
+        - $ref: '#/definitions/constvar.JobType'
+        description: 宸ョ浠ｇ爜
+      workTypeID:
+        description: 宸ョID
+        type: integer
+      workTypeName:
+        description: 宸ョ鍚嶇О
+        type: string
+      workerId:
+        description: 鍛樺伐ID
         type: string
     type: object
   request.SaveRankStandard:
@@ -2593,6 +2632,58 @@
       summary: 鍒犻櫎钖叕鏂规
       tags:
       - 鍛樺伐钖祫/钖叕鏂规
+  /api-jl/v1/salary/getPayrollConstituteList:
+    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:
+                  additionalProperties: true
+                  type: object
+              type: object
+      summary: 鑾峰彇浜哄憳姣忔湀鐨勮柂璧勫垪琛�
+      tags:
+      - 鍛樺伐钖祫/钖叕鏂规
   /api-jl/v1/salary/getPayrollProductionCarList:
     get:
       parameters:
@@ -2821,6 +2912,30 @@
       summary: 鑾峰彇钖祫绫诲瀷鍒楄〃
       tags:
       - 鍛樺伐钖祫/钖叕鏂规
+  /api-jl/v1/salary/savePayrollConstitute:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.SavePayrollConstitute'
+      - 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/salary/saveSalaryPlan:
     post:
       parameters:
@@ -2914,7 +3029,6 @@
         - 2
         - 3
         - 4
-        - 5
         in: query
         name: dictType
         type: integer
@@ -2922,14 +3036,12 @@
           DictTypeColor: 棰滆壊
           DictTypeMarket: 搴勫彛
           DictTypeSpec: 瑙勬牸
-          DictTypeSubsidy: 琛ヨ创
           DictTypeWorkshop: 杞﹂棿
         x-enum-varnames:
         - DictTypeMarket
         - DictTypeWorkshop
         - DictTypeColor
         - DictTypeSpec
-        - DictTypeSubsidy
       - description: 鎼滅储鍏抽敭瀛�
         in: query
         name: keyword

--
Gitblit v1.8.0