From 9a55dd2315602ab802ee7fcbad46cef17ffe23d8 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 18 四月 2024 16:50:29 +0800
Subject: [PATCH] swag提交

---
 controllers/request/worker_request.go |   12 
 controllers/salary_plan_controller.go |   78 ++
 docs/swagger.yaml                     |  503 +++++++++++++
 docs/docs.go                          |  769 +++++++++++++++++++++
 docs/swagger.json                     |  769 +++++++++++++++++++++
 router/router.go                      |    2 
 6 files changed, 2,129 insertions(+), 4 deletions(-)

diff --git a/controllers/request/worker_request.go b/controllers/request/worker_request.go
index 3eb6fbf..2b8166e 100644
--- a/controllers/request/worker_request.go
+++ b/controllers/request/worker_request.go
@@ -1,5 +1,7 @@
 package request
 
+import "silkserver/constvar"
+
 type GetWorkerList struct {
 	PageInfo
 	KeyWord string `json:"keyWord"`
@@ -14,3 +16,13 @@
 	PageInfo
 	KeyWord string `json:"keyWord"`
 }
+
+type SalaryType struct {
+	Type   constvar.MiniDictType `json:"type"` //瀛楀吀绫诲瀷,钖祫绫诲瀷:8
+	Values []SalaryTypeValue     `json:"values"`
+}
+
+type SalaryTypeValue struct {
+	Name      string `json:"name"`      //鍚嶇О
+	IsDefault bool   `json:"isDefault"` //鏄惁鍙紪杈�
+}
diff --git a/controllers/salary_plan_controller.go b/controllers/salary_plan_controller.go
index 1aa74b4..9934ca0 100644
--- a/controllers/salary_plan_controller.go
+++ b/controllers/salary_plan_controller.go
@@ -2,6 +2,8 @@
 
 import (
 	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+	"silkserver/constvar"
 	"silkserver/controllers/request"
 	"silkserver/extend/code"
 	"silkserver/extend/util"
@@ -20,7 +22,7 @@
 //	@Tags		鍛樺伐钖祫/钖叕鏂规
 //	@Summary	淇濆瓨钖叕鏂规
 //	@Produce	application/json
-//	@Param		object	body		models.SaveSalaryPlan	true	"鍙傛暟"
+//	@Param		object	body		models.SalaryPlan	true	"鍙傛暟"
 //	@Param     	Authorization	header string true "token"
 //	@Success	200		{object}	util.Response		"鎴愬姛"
 //	@Router		/api-jl/v1/salary/saveSalaryPlan [post]
@@ -104,3 +106,77 @@
 	}
 	util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
 }
+
+// SaveSalaryType
+//
+//	@Tags		鍛樺伐钖祫/钖叕鏂规
+//	@Summary	淇濆瓨钖祫绫诲瀷
+//	@Produce	application/json
+//	@Param		object	body		request.SalaryType	true	"鍙傛暟"
+//	@Param     	Authorization	header string true "token"
+//	@Success	200		{object}	util.Response		"鎴愬姛"
+//	@Router		/api-jl/v1/salary/saveSalaryType [post]
+func (slf SalaryPlanController) SaveSalaryType(c *gin.Context) {
+	var params request.SalaryType
+	err := c.BindJSON(&params)
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙f瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+		return
+	}
+	if params.Type == 0 {
+		util.ResponseFormat(c, code.RequestParamError, "绫诲瀷涓嶈兘涓虹┖")
+		return
+	}
+	types := make([]*models.MiniDict, 0)
+	for _, value := range params.Values {
+		var dict models.MiniDict
+		dict.Name = value.Name
+		dict.IsDefault = value.IsDefault
+		dict.Type = params.Type
+		types = append(types, &dict)
+	}
+	err = models.WithTransaction(func(db *gorm.DB) error {
+		err = models.NewMiniDictSearch().SetOrm(db).SetType(params.Type).Delete()
+		if err != nil {
+			return err
+		}
+		err = models.NewMiniDictSearch().SetOrm(db).CreateBatch(types)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "淇濆瓨澶辫触")
+		return
+	}
+	util.ResponseFormat(c, code.Success, "淇濆瓨鎴愬姛")
+}
+
+// GetSalaryTypeList
+//
+//	@Tags		鍛樺伐钖祫/钖叕鏂规
+//	@Summary	鑾峰彇钖祫绫诲瀷鍒楄〃
+//	@Produce	application/json
+//	@Param		number	path		string			true	"type"	"鍙傛暟"
+//	@Param     	Authorization	header string true "token"
+//	@Success	200		{object}	util.ResponseList{data=[]models.MiniDict}		"鎴愬姛"
+//	@Router		/api-jl/v1/salary/getSalaryTypeList/{type} [get]
+func (slf SalaryPlanController) GetSalaryTypeList(c *gin.Context) {
+	tp := c.Param("type")
+	if tp == "" {
+		util.ResponseFormat(c, code.RequestParamError, "鏃犳晥鐨勭被鍨�")
+		return
+	}
+	atoi, _ := strconv.Atoi(tp)
+	if atoi == 0 {
+		util.ResponseFormat(c, code.RequestParamError, "鏃犳晥鐨勭被鍨�")
+		return
+	}
+	dicts, err := models.NewMiniDictSearch().SetType(constvar.MiniDictType(atoi)).FindNotTotal()
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
+		return
+	}
+	util.ResponseFormat(c, code.Success, dicts)
+}
diff --git a/docs/docs.go b/docs/docs.go
index 3a2131b..87fb0fa 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -504,6 +504,217 @@
                 }
             }
         },
+        "/api-jl/v1/salary/deleteSalaryPlanInfo/{id}": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "鍒犻櫎钖叕鏂规",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/salary/getSalaryPlanList": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "鑾峰彇钖叕鏂规鍒楄〃",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.GetSalaryPlanList"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.SalaryPlan"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/salary/getSalaryTypeList/{type}": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "鑾峰彇钖祫绫诲瀷鍒楄〃",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "type",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.MiniDict"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/salary/saveSalaryPlan": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "淇濆瓨钖叕鏂规",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.SalaryPlan"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/salary/saveSalaryType": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "淇濆瓨钖祫绫诲瀷",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.SalaryType"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-jl/v1/system/deletePriceStandard/{id}": {
             "delete": {
                 "produces": [
@@ -1150,6 +1361,291 @@
                     }
                 }
             }
+        },
+        "/api-jl/v1/worker/createWorkerInfo": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/鍛樺伐淇℃伅"
+                ],
+                "summary": "鍒涘缓浜哄憳淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.Worker"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/deleteWorkTypeInfo/{id}": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/宸ョ淇℃伅"
+                ],
+                "summary": "鍒犻櫎宸ョ淇℃伅",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/deleteWorkerInfo/{id}": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/鍛樺伐淇℃伅"
+                ],
+                "summary": "鍒犻櫎浜哄憳淇℃伅",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/getWorkTypeList": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/宸ョ淇℃伅"
+                ],
+                "summary": "鑾峰彇宸ョ鍒楄〃",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.GetWorkTypeList"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.WorkTypeManage"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/getWorkerList": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/鍛樺伐淇℃伅"
+                ],
+                "summary": "鑾峰彇浜哄憳淇℃伅鍒楄〃",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.GetWorkerList"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.Worker"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/saveWorkTypeInfo": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/宸ョ淇℃伅"
+                ],
+                "summary": "淇濆瓨宸ョ淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.WorkTypeManage"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/updateWorkerInfo": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/鍛樺伐淇℃伅"
+                ],
+                "summary": "鏇存柊浜哄憳淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.Worker"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
@@ -1214,6 +1710,60 @@
                 "DictTypeWorkshop",
                 "DictTypeColor",
                 "DictTypeSpec"
+            ]
+        },
+        "constvar.MiniDictType": {
+            "type": "integer",
+            "enum": [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8
+            ],
+            "x-enum-comments": {
+                "EarlyWarningDay": "棰勮澶╂暟",
+                "InspectionWayType": "璐ㄦ鏂瑰紡绫诲瀷",
+                "MiniDictTypeBomVersionType": "Bom鐗堟湰绫诲瀷",
+                "MiniDictTypePlcBrand": "PLC鍝佺墝",
+                "OutsourcingSupplierCreditGrade": "淇$敤绛夌骇",
+                "OutsourcingSupplierRange": "渚涜揣鑼冨洿",
+                "OutsourcingSupplierType": "濮斿渚涘簲鍟嗙被鍨�",
+                "SalaryType": "鍢夎仈钖祫绫诲瀷"
+            },
+            "x-enum-varnames": [
+                "MiniDictTypePlcBrand",
+                "MiniDictTypeBomVersionType",
+                "EarlyWarningDay",
+                "InspectionWayType",
+                "OutsourcingSupplierType",
+                "OutsourcingSupplierCreditGrade",
+                "OutsourcingSupplierRange",
+                "SalaryType"
+            ]
+        },
+        "constvar.WorkerStatus": {
+            "type": "integer",
+            "enum": [
+                1,
+                2,
+                3,
+                4
+            ],
+            "x-enum-comments": {
+                "WorkerStatusHoliday": "璇峰亣",
+                "WorkerStatusOvertime": "鍔犵彮",
+                "WorkerStatusRest": "浼戞伅",
+                "WorkerStatusWorking": "鍦ㄧ彮"
+            },
+            "x-enum-varnames": [
+                "WorkerStatusWorking",
+                "WorkerStatusRest",
+                "WorkerStatusHoliday",
+                "WorkerStatusOvertime"
             ]
         },
         "gorm.DeletedAt": {
@@ -1516,6 +2066,26 @@
                 }
             }
         },
+        "models.MiniDict": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "isDefault": {
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "type": {
+                    "$ref": "#/definitions/constvar.MiniDictType"
+                },
+                "value": {
+                    "type": "string"
+                }
+            }
+        },
         "models.RawSilkPriceStandard": {
             "type": "object",
             "properties": {
@@ -1548,6 +2118,123 @@
                 },
                 "updatedAt": {
                     "type": "string"
+                }
+            }
+        },
+        "models.SalaryPlan": {
+            "type": "object",
+            "properties": {
+                "addPeople": {
+                    "type": "string"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "createdAt": {
+                    "type": "string"
+                },
+                "cycle": {
+                    "type": "string"
+                },
+                "deletedAt": {
+                    "$ref": "#/definitions/gorm.DeletedAt"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "salaryFormula": {
+                    "type": "string"
+                },
+                "salaryType": {
+                    "type": "string"
+                },
+                "updatedAt": {
+                    "type": "string"
+                },
+                "workTypes": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.WorkTypeManage"
+                    }
+                }
+            }
+        },
+        "models.WorkTypeManage": {
+            "type": "object",
+            "properties": {
+                "addPeople": {
+                    "type": "string"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "createdAt": {
+                    "type": "string"
+                },
+                "deletedAt": {
+                    "$ref": "#/definitions/gorm.DeletedAt"
+                },
+                "guaranteedWages": {
+                    "type": "number"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "isGuaranteed": {
+                    "type": "boolean"
+                },
+                "salaryPlans": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.SalaryPlan"
+                    }
+                },
+                "updatedAt": {
+                    "type": "string"
+                },
+                "workName": {
+                    "type": "string"
+                }
+            }
+        },
+        "models.Worker": {
+            "type": "object",
+            "properties": {
+                "addPeople": {
+                    "type": "string"
+                },
+                "employmentTime": {
+                    "type": "string"
+                },
+                "groupNumber": {
+                    "type": "integer"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "phoneNum": {
+                    "type": "string"
+                },
+                "shopId": {
+                    "type": "string"
+                },
+                "shopName": {
+                    "type": "string"
+                },
+                "status": {
+                    "$ref": "#/definitions/constvar.WorkerStatus"
+                },
+                "workType": {
+                    "type": "string"
+                },
+                "workTypeId": {
+                    "type": "integer"
                 }
             }
         },
@@ -1934,6 +2621,54 @@
                 }
             }
         },
+        "request.GetSalaryPlanList": {
+            "type": "object",
+            "properties": {
+                "keyWord": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                }
+            }
+        },
+        "request.GetWorkTypeList": {
+            "type": "object",
+            "properties": {
+                "keyWord": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                }
+            }
+        },
+        "request.GetWorkerList": {
+            "type": "object",
+            "properties": {
+                "keyWord": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                }
+            }
+        },
         "request.GetWorkshopManageCar": {
             "type": "object",
             "properties": {
@@ -1942,7 +2677,7 @@
                     "type": "integer"
                 },
                 "marketName": {
-                    "description": "/搴勫彛鍚�",
+                    "description": "搴勫彛鍚�",
                     "type": "string"
                 },
                 "workshopName": {
@@ -2025,6 +2760,38 @@
                 }
             }
         },
+        "request.SalaryType": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "description": "瀛楀吀绫诲瀷,钖祫绫诲瀷:8",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.MiniDictType"
+                        }
+                    ]
+                },
+                "values": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/request.SalaryTypeValue"
+                    }
+                }
+            }
+        },
+        "request.SalaryTypeValue": {
+            "type": "object",
+            "properties": {
+                "isDefault": {
+                    "description": "鏄惁鍙紪杈�",
+                    "type": "boolean"
+                },
+                "name": {
+                    "description": "鍚嶇О",
+                    "type": "string"
+                }
+            }
+        },
         "request.SaveRankStandard": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index d8f2eae..a107c35 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -492,6 +492,217 @@
                 }
             }
         },
+        "/api-jl/v1/salary/deleteSalaryPlanInfo/{id}": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "鍒犻櫎钖叕鏂规",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/salary/getSalaryPlanList": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "鑾峰彇钖叕鏂规鍒楄〃",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.GetSalaryPlanList"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.SalaryPlan"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/salary/getSalaryTypeList/{type}": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "鑾峰彇钖祫绫诲瀷鍒楄〃",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "type",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.MiniDict"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/salary/saveSalaryPlan": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "淇濆瓨钖叕鏂规",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.SalaryPlan"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/salary/saveSalaryType": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐钖祫/钖叕鏂规"
+                ],
+                "summary": "淇濆瓨钖祫绫诲瀷",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.SalaryType"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-jl/v1/system/deletePriceStandard/{id}": {
             "delete": {
                 "produces": [
@@ -1138,6 +1349,291 @@
                     }
                 }
             }
+        },
+        "/api-jl/v1/worker/createWorkerInfo": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/鍛樺伐淇℃伅"
+                ],
+                "summary": "鍒涘缓浜哄憳淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.Worker"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/deleteWorkTypeInfo/{id}": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/宸ョ淇℃伅"
+                ],
+                "summary": "鍒犻櫎宸ョ淇℃伅",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/deleteWorkerInfo/{id}": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/鍛樺伐淇℃伅"
+                ],
+                "summary": "鍒犻櫎浜哄憳淇℃伅",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/getWorkTypeList": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/宸ョ淇℃伅"
+                ],
+                "summary": "鑾峰彇宸ョ鍒楄〃",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.GetWorkTypeList"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.WorkTypeManage"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/getWorkerList": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/鍛樺伐淇℃伅"
+                ],
+                "summary": "鑾峰彇浜哄憳淇℃伅鍒楄〃",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.GetWorkerList"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.Worker"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/saveWorkTypeInfo": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/宸ョ淇℃伅"
+                ],
+                "summary": "淇濆瓨宸ョ淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.WorkTypeManage"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-jl/v1/worker/updateWorkerInfo": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍛樺伐绠$悊/鍛樺伐淇℃伅"
+                ],
+                "summary": "鏇存柊浜哄憳淇℃伅",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.Worker"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
@@ -1202,6 +1698,60 @@
                 "DictTypeWorkshop",
                 "DictTypeColor",
                 "DictTypeSpec"
+            ]
+        },
+        "constvar.MiniDictType": {
+            "type": "integer",
+            "enum": [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8
+            ],
+            "x-enum-comments": {
+                "EarlyWarningDay": "棰勮澶╂暟",
+                "InspectionWayType": "璐ㄦ鏂瑰紡绫诲瀷",
+                "MiniDictTypeBomVersionType": "Bom鐗堟湰绫诲瀷",
+                "MiniDictTypePlcBrand": "PLC鍝佺墝",
+                "OutsourcingSupplierCreditGrade": "淇$敤绛夌骇",
+                "OutsourcingSupplierRange": "渚涜揣鑼冨洿",
+                "OutsourcingSupplierType": "濮斿渚涘簲鍟嗙被鍨�",
+                "SalaryType": "鍢夎仈钖祫绫诲瀷"
+            },
+            "x-enum-varnames": [
+                "MiniDictTypePlcBrand",
+                "MiniDictTypeBomVersionType",
+                "EarlyWarningDay",
+                "InspectionWayType",
+                "OutsourcingSupplierType",
+                "OutsourcingSupplierCreditGrade",
+                "OutsourcingSupplierRange",
+                "SalaryType"
+            ]
+        },
+        "constvar.WorkerStatus": {
+            "type": "integer",
+            "enum": [
+                1,
+                2,
+                3,
+                4
+            ],
+            "x-enum-comments": {
+                "WorkerStatusHoliday": "璇峰亣",
+                "WorkerStatusOvertime": "鍔犵彮",
+                "WorkerStatusRest": "浼戞伅",
+                "WorkerStatusWorking": "鍦ㄧ彮"
+            },
+            "x-enum-varnames": [
+                "WorkerStatusWorking",
+                "WorkerStatusRest",
+                "WorkerStatusHoliday",
+                "WorkerStatusOvertime"
             ]
         },
         "gorm.DeletedAt": {
@@ -1504,6 +2054,26 @@
                 }
             }
         },
+        "models.MiniDict": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "isDefault": {
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "type": {
+                    "$ref": "#/definitions/constvar.MiniDictType"
+                },
+                "value": {
+                    "type": "string"
+                }
+            }
+        },
         "models.RawSilkPriceStandard": {
             "type": "object",
             "properties": {
@@ -1536,6 +2106,123 @@
                 },
                 "updatedAt": {
                     "type": "string"
+                }
+            }
+        },
+        "models.SalaryPlan": {
+            "type": "object",
+            "properties": {
+                "addPeople": {
+                    "type": "string"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "createdAt": {
+                    "type": "string"
+                },
+                "cycle": {
+                    "type": "string"
+                },
+                "deletedAt": {
+                    "$ref": "#/definitions/gorm.DeletedAt"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "salaryFormula": {
+                    "type": "string"
+                },
+                "salaryType": {
+                    "type": "string"
+                },
+                "updatedAt": {
+                    "type": "string"
+                },
+                "workTypes": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.WorkTypeManage"
+                    }
+                }
+            }
+        },
+        "models.WorkTypeManage": {
+            "type": "object",
+            "properties": {
+                "addPeople": {
+                    "type": "string"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "createdAt": {
+                    "type": "string"
+                },
+                "deletedAt": {
+                    "$ref": "#/definitions/gorm.DeletedAt"
+                },
+                "guaranteedWages": {
+                    "type": "number"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "isGuaranteed": {
+                    "type": "boolean"
+                },
+                "salaryPlans": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.SalaryPlan"
+                    }
+                },
+                "updatedAt": {
+                    "type": "string"
+                },
+                "workName": {
+                    "type": "string"
+                }
+            }
+        },
+        "models.Worker": {
+            "type": "object",
+            "properties": {
+                "addPeople": {
+                    "type": "string"
+                },
+                "employmentTime": {
+                    "type": "string"
+                },
+                "groupNumber": {
+                    "type": "integer"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "phoneNum": {
+                    "type": "string"
+                },
+                "shopId": {
+                    "type": "string"
+                },
+                "shopName": {
+                    "type": "string"
+                },
+                "status": {
+                    "$ref": "#/definitions/constvar.WorkerStatus"
+                },
+                "workType": {
+                    "type": "string"
+                },
+                "workTypeId": {
+                    "type": "integer"
                 }
             }
         },
@@ -1922,6 +2609,54 @@
                 }
             }
         },
+        "request.GetSalaryPlanList": {
+            "type": "object",
+            "properties": {
+                "keyWord": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                }
+            }
+        },
+        "request.GetWorkTypeList": {
+            "type": "object",
+            "properties": {
+                "keyWord": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                }
+            }
+        },
+        "request.GetWorkerList": {
+            "type": "object",
+            "properties": {
+                "keyWord": {
+                    "type": "string"
+                },
+                "page": {
+                    "description": "椤电爜",
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "description": "姣忛〉澶у皬",
+                    "type": "integer"
+                }
+            }
+        },
         "request.GetWorkshopManageCar": {
             "type": "object",
             "properties": {
@@ -1930,7 +2665,7 @@
                     "type": "integer"
                 },
                 "marketName": {
-                    "description": "/搴勫彛鍚�",
+                    "description": "搴勫彛鍚�",
                     "type": "string"
                 },
                 "workshopName": {
@@ -2013,6 +2748,38 @@
                 }
             }
         },
+        "request.SalaryType": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "description": "瀛楀吀绫诲瀷,钖祫绫诲瀷:8",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.MiniDictType"
+                        }
+                    ]
+                },
+                "values": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/request.SalaryTypeValue"
+                    }
+                }
+            }
+        },
+        "request.SalaryTypeValue": {
+            "type": "object",
+            "properties": {
+                "isDefault": {
+                    "description": "鏄惁鍙紪杈�",
+                    "type": "boolean"
+                },
+                "name": {
+                    "description": "鍚嶇О",
+                    "type": "string"
+                }
+            }
+        },
         "request.SaveRankStandard": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index da57293..7603dce 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -50,6 +50,52 @@
     - DictTypeWorkshop
     - DictTypeColor
     - DictTypeSpec
+  constvar.MiniDictType:
+    enum:
+    - 1
+    - 2
+    - 3
+    - 4
+    - 5
+    - 6
+    - 7
+    - 8
+    type: integer
+    x-enum-comments:
+      EarlyWarningDay: 棰勮澶╂暟
+      InspectionWayType: 璐ㄦ鏂瑰紡绫诲瀷
+      MiniDictTypeBomVersionType: Bom鐗堟湰绫诲瀷
+      MiniDictTypePlcBrand: PLC鍝佺墝
+      OutsourcingSupplierCreditGrade: 淇$敤绛夌骇
+      OutsourcingSupplierRange: 渚涜揣鑼冨洿
+      OutsourcingSupplierType: 濮斿渚涘簲鍟嗙被鍨�
+      SalaryType: 鍢夎仈钖祫绫诲瀷
+    x-enum-varnames:
+    - MiniDictTypePlcBrand
+    - MiniDictTypeBomVersionType
+    - EarlyWarningDay
+    - InspectionWayType
+    - OutsourcingSupplierType
+    - OutsourcingSupplierCreditGrade
+    - OutsourcingSupplierRange
+    - SalaryType
+  constvar.WorkerStatus:
+    enum:
+    - 1
+    - 2
+    - 3
+    - 4
+    type: integer
+    x-enum-comments:
+      WorkerStatusHoliday: 璇峰亣
+      WorkerStatusOvertime: 鍔犵彮
+      WorkerStatusRest: 浼戞伅
+      WorkerStatusWorking: 鍦ㄧ彮
+    x-enum-varnames:
+    - WorkerStatusWorking
+    - WorkerStatusRest
+    - WorkerStatusHoliday
+    - WorkerStatusOvertime
   gorm.DeletedAt:
     properties:
       time:
@@ -259,6 +305,19 @@
         description: 鏁伴噺
         type: integer
     type: object
+  models.MiniDict:
+    properties:
+      id:
+        type: integer
+      isDefault:
+        type: boolean
+      name:
+        type: string
+      type:
+        $ref: '#/definitions/constvar.MiniDictType'
+      value:
+        type: string
+    type: object
   models.RawSilkPriceStandard:
     properties:
       createdAt:
@@ -281,6 +340,83 @@
         type: string
       updatedAt:
         type: string
+    type: object
+  models.SalaryPlan:
+    properties:
+      addPeople:
+        type: string
+      createTime:
+        type: string
+      createdAt:
+        type: string
+      cycle:
+        type: string
+      deletedAt:
+        $ref: '#/definitions/gorm.DeletedAt'
+      id:
+        type: integer
+      name:
+        type: string
+      salaryFormula:
+        type: string
+      salaryType:
+        type: string
+      updatedAt:
+        type: string
+      workTypes:
+        items:
+          $ref: '#/definitions/models.WorkTypeManage'
+        type: array
+    type: object
+  models.WorkTypeManage:
+    properties:
+      addPeople:
+        type: string
+      createTime:
+        type: string
+      createdAt:
+        type: string
+      deletedAt:
+        $ref: '#/definitions/gorm.DeletedAt'
+      guaranteedWages:
+        type: number
+      id:
+        type: integer
+      isGuaranteed:
+        type: boolean
+      salaryPlans:
+        items:
+          $ref: '#/definitions/models.SalaryPlan'
+        type: array
+      updatedAt:
+        type: string
+      workName:
+        type: string
+    type: object
+  models.Worker:
+    properties:
+      addPeople:
+        type: string
+      employmentTime:
+        type: string
+      groupNumber:
+        type: integer
+      id:
+        type: string
+      name:
+        type: string
+      phoneNum:
+        type: string
+      shopId:
+        type: string
+      shopName:
+        type: string
+      status:
+        $ref: '#/definitions/constvar.WorkerStatus'
+      workType:
+        type: string
+      workTypeId:
+        type: integer
     type: object
   models.WorkshopManage:
     properties:
@@ -543,13 +679,46 @@
         description: 鍚堣
         type: number
     type: object
+  request.GetSalaryPlanList:
+    properties:
+      keyWord:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetWorkTypeList:
+    properties:
+      keyWord:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetWorkerList:
+    properties:
+      keyWord:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
   request.GetWorkshopManageCar:
     properties:
       groupNumber:
         description: 缁勫埆
         type: integer
       marketName:
-        description: /搴勫彛鍚�
+        description: 搴勫彛鍚�
         type: string
       workshopName:
         description: 杞﹂棿鍚嶇О
@@ -604,6 +773,26 @@
       startFineness:
         description: 寮�濮嬬氦搴�
         type: number
+    type: object
+  request.SalaryType:
+    properties:
+      type:
+        allOf:
+        - $ref: '#/definitions/constvar.MiniDictType'
+        description: 瀛楀吀绫诲瀷,钖祫绫诲瀷:8
+      values:
+        items:
+          $ref: '#/definitions/request.SalaryTypeValue'
+        type: array
+    type: object
+  request.SalaryTypeValue:
+    properties:
+      isDefault:
+        description: 鏄惁鍙紪杈�
+        type: boolean
+      name:
+        description: 鍚嶇О
+        type: string
     type: object
   request.SaveRankStandard:
     properties:
@@ -1153,6 +1342,138 @@
       summary: 淇濆瓨浜ч噺鐧昏琛�
       tags:
       - 鐢熶骇绠$悊/浜ч噺鐧昏琛�
+  /api-jl/v1/salary/deleteSalaryPlanInfo/{id}:
+    delete:
+      parameters:
+      - description: id
+        in: path
+        name: number
+        required: true
+        type: string
+      - 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/getSalaryPlanList:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetSalaryPlanList'
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.SalaryPlan'
+                  type: array
+              type: object
+      summary: 鑾峰彇钖叕鏂规鍒楄〃
+      tags:
+      - 鍛樺伐钖祫/钖叕鏂规
+  /api-jl/v1/salary/getSalaryTypeList/{type}:
+    get:
+      parameters:
+      - description: type
+        in: path
+        name: number
+        required: true
+        type: string
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.MiniDict'
+                  type: array
+              type: object
+      summary: 鑾峰彇钖祫绫诲瀷鍒楄〃
+      tags:
+      - 鍛樺伐钖祫/钖叕鏂规
+  /api-jl/v1/salary/saveSalaryPlan:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/models.SalaryPlan'
+      - 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/saveSalaryType:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.SalaryType'
+      - 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/system/deletePriceStandard/{id}:
     delete:
       parameters:
@@ -1551,4 +1872,184 @@
       summary: 淇濆瓨杞﹂棿绠$悊
       tags:
       - 绯荤粺璁剧疆/杞﹂棿绠$悊
+  /api-jl/v1/worker/createWorkerInfo:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/models.Worker'
+      - 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/worker/deleteWorkTypeInfo/{id}:
+    delete:
+      parameters:
+      - description: id
+        in: path
+        name: number
+        required: true
+        type: string
+      - 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/worker/deleteWorkerInfo/{id}:
+    delete:
+      parameters:
+      - description: id
+        in: path
+        name: number
+        required: true
+        type: string
+      - 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/worker/getWorkTypeList:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetWorkTypeList'
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.WorkTypeManage'
+                  type: array
+              type: object
+      summary: 鑾峰彇宸ョ鍒楄〃
+      tags:
+      - 鍛樺伐绠$悊/宸ョ淇℃伅
+  /api-jl/v1/worker/getWorkerList:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetWorkerList'
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.Worker'
+                  type: array
+              type: object
+      summary: 鑾峰彇浜哄憳淇℃伅鍒楄〃
+      tags:
+      - 鍛樺伐绠$悊/鍛樺伐淇℃伅
+  /api-jl/v1/worker/saveWorkTypeInfo:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/models.WorkTypeManage'
+      - 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/worker/updateWorkerInfo:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/models.Worker'
+      - description: token
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 鏇存柊浜哄憳淇℃伅
+      tags:
+      - 鍛樺伐绠$悊/鍛樺伐淇℃伅
 swagger: "2.0"
diff --git a/router/router.go b/router/router.go
index 04128b2..e4e2fba 100644
--- a/router/router.go
+++ b/router/router.go
@@ -96,6 +96,8 @@
 		salaryApi.POST("saveSalaryPlan", salaryPlanController.SaveSalaryPlan)                   //淇濆瓨钖叕鏂规
 		salaryApi.POST("getSalaryPlanList", salaryPlanController.GetSalaryPlanList)             //鑾峰彇钖叕鏂规鍒楄〃
 		salaryApi.DELETE("deleteSalaryPlanInfo/:id", salaryPlanController.DeleteSalaryPlanInfo) //鍒犻櫎钖叕鏂规
+		salaryApi.GET("getSalaryTypeList/:type", salaryPlanController.GetSalaryTypeList)        //鑾峰彇钖祫绫诲瀷鍒楄〃
+		salaryApi.POST("saveSalaryType", salaryPlanController.SaveSalaryType)                   //淇濆瓨钖祫绫诲瀷
 	}
 
 	return r

--
Gitblit v1.8.0