From cc7c2094568ea8f9d1697da5ed0a2c759ca81abd Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期五, 30 八月 2024 17:18:30 +0800
Subject: [PATCH] 方法修改,修改薪资列表,添加分页查询

---
 controllers/request/worker_request.go |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/controllers/request/worker_request.go b/controllers/request/worker_request.go
index 2b8166e..3ee1f39 100644
--- a/controllers/request/worker_request.go
+++ b/controllers/request/worker_request.go
@@ -4,17 +4,17 @@
 
 type GetWorkerList struct {
 	PageInfo
-	KeyWord string `json:"keyWord"`
+	Keyword string `json:"keyword"`
 }
 
 type GetWorkTypeList struct {
 	PageInfo
-	KeyWord string `json:"keyWord"`
+	Keyword string `json:"keyword"`
 }
 
 type GetSalaryPlanList struct {
 	PageInfo
-	KeyWord string `json:"keyWord"`
+	Keyword string `json:"keyword"`
 }
 
 type SalaryType struct {
@@ -23,6 +23,28 @@
 }
 
 type SalaryTypeValue struct {
+	Id        uint   `json:"id"`
 	Name      string `json:"name"`      //鍚嶇О
 	IsDefault bool   `json:"isDefault"` //鏄惁鍙紪杈�
 }
+
+type AddWorkPositionRequest struct {
+	StartDate           string `gorm:"type:varchar(255);not null;default:'';comment:寮�濮嬫棩鏈�" validate:"required"`                  //寮�濮嬫棩鏈�
+	EndDate             string `gorm:"type:varchar(255);not null;default:'';comment:缁撴潫鏃ユ湡" validate:"required"`                  //缁撴潫鏃ユ湡
+	Workshop            string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"workshop" validate:"required"`               //杞﹂棿缂栧彿
+	WorkshopName        string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"workshopName" validate:"required"`           //杞﹂棿鍚嶇О
+	WorkshopGroup       int    `gorm:"type:int(11);not null;default:0;comment:杞︾粍" json:"workshopGroup"  validate:"required"`    //杞︾粍
+	StartWorkerPosition int    `json:"startWorkerPosition"  gorm:"type:int(11);comment:寮�濮嬭溅鍙�"  validate:"required"`              //寮�濮嬭溅鍙�
+	EndWorkerPosition   int    `json:"endWorkerPosition"    gorm:"type:int(11);comment:缁撴潫杞﹀彿"  validate:"required"`              //缁撴潫杞﹀彿
+	WorkerId            string `gorm:"type:varchar(255);not null;default:'';comment:宸ヤ汉ID" json:"workerId"  validate:"required"` //宸ヤ汉ID
+}
+
+type UpdateWorkerPositionRequest struct {
+	Id uint `json:"id"`
+	AddWorkPositionRequest
+}
+
+type GetWorkerPositionList struct {
+	PageInfo
+	Keyword string `json:"keyword"`
+}

--
Gitblit v1.8.0