From 9b17ac4dc5670a0468780b4219520f87a2131de1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 23 四月 2024 14:31:05 +0800
Subject: [PATCH] 增加字段
---
controllers/worker_position_controller.go | 1 +
controllers/request/worker_request.go | 5 +++--
models/worker_position.go | 17 +++++++++--------
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/controllers/request/worker_request.go b/controllers/request/worker_request.go
index 66ef393..1e15736 100644
--- a/controllers/request/worker_request.go
+++ b/controllers/request/worker_request.go
@@ -30,10 +30,11 @@
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"` //杞﹂棿
+ 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"` //缁撴潫杞﹀彿
+ 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
}
diff --git a/controllers/worker_position_controller.go b/controllers/worker_position_controller.go
index ad675f1..51015a3 100644
--- a/controllers/worker_position_controller.go
+++ b/controllers/worker_position_controller.go
@@ -41,6 +41,7 @@
StartDate: params.StartDate,
EndDate: params.EndDate,
Workshop: params.Workshop,
+ WorkshopName: params.WorkshopName,
WorkshopGroup: params.WorkshopGroup,
StartWorkerPosition: params.StartWorkerPosition,
EndWorkerPosition: params.EndWorkerPosition,
diff --git a/models/worker_position.go b/models/worker_position.go
index 5597232..0c3653d 100644
--- a/models/worker_position.go
+++ b/models/worker_position.go
@@ -10,14 +10,15 @@
// WorkerPosition 鏈哄彴绠$悊
WorkerPosition struct {
gorm.Model
- StartDate string `gorm:"type:varchar(255);not null;default:'';comment:寮�濮嬫棩鏈�"` //寮�濮嬫棩鏈�
- EndDate string `gorm:"type:varchar(255);not null;default:'';comment:缁撴潫鏃ユ湡"` //缁撴潫鏃ユ湡
- Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"name"` //杞﹂棿
- WorkshopGroup int `gorm:"type:int(11);not null;default:0;comment:杞︾粍" json:"workshopGroup"` //杞︾粍
- StartWorkerPosition int `json:"startWorkerPosition" gorm:"type:int(11);comment:寮�濮嬭溅鍙�"` //寮�濮嬭溅鍙�
- EndWorkerPosition int `json:"endWorkerPosition" gorm:"type:int(11);comment:缁撴潫杞﹀彿"` //缁撴潫杞﹀彿
- WorkerId string `gorm:"type:varchar(255);not null;default:'';comment:宸ヤ汉ID" json:"workerId"` //宸ヤ汉ID
- Worker Worker `gorm:"foreignkey:WorkerId" json:"worker"` //宸ヤ汉
+ StartDate string `gorm:"type:varchar(255);not null;default:'';comment:寮�濮嬫棩鏈�"` //寮�濮嬫棩鏈�
+ EndDate string `gorm:"type:varchar(255);not null;default:'';comment:缁撴潫鏃ユ湡"` //缁撴潫鏃ユ湡
+ Workshop string `gorm:"type:varchar(255);not null;default:'';comment:杞﹂棿缂栧彿" json:"workshop"` //杞﹂棿缂栧彿
+ WorkshopName string `gorm:"type:varchar(255);not null;default:'';comment:杞﹂棿鍚嶇О" json:"workshopName"` //杞﹂棿鍚嶇О
+ WorkshopGroup int `gorm:"type:int(11);not null;default:0;comment:杞︾粍" json:"workshopGroup"` //杞︾粍
+ StartWorkerPosition int `json:"startWorkerPosition" gorm:"type:int(11);comment:寮�濮嬭溅鍙�"` //寮�濮嬭溅鍙�
+ EndWorkerPosition int `json:"endWorkerPosition" gorm:"type:int(11);comment:缁撴潫杞﹀彿"` //缁撴潫杞﹀彿
+ WorkerId string `gorm:"type:varchar(255);not null;default:'';comment:宸ヤ汉ID" json:"workerId"` //宸ヤ汉ID
+ Worker Worker `gorm:"foreignkey:WorkerId" json:"worker"` //宸ヤ汉
Creator string `gorm:"type:varchar(255);not null;default:'';comment:娣诲姞浜�" json:"creator"`
}
WorkerPositionSearch struct {
--
Gitblit v1.8.0