From e820b858bfb63129884f38794f80bdedee9bb550 Mon Sep 17 00:00:00 2001 From: ZHENG XIAOYI Date: Mon, 2 Mar 2026 14:01:52 +0800 Subject: [PATCH] Change department to position --- controllers/employees_controller.go | 2 +- models/models.go | 6 +++--- services/companies_service.go | 2 +- services/employees_service.go | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/controllers/employees_controller.go b/controllers/employees_controller.go index 296c4b8..b1a0f8a 100644 --- a/controllers/employees_controller.go +++ b/controllers/employees_controller.go @@ -48,7 +48,7 @@ func (c *EmployeeSerialsController) Generate(ctx *gin.Context) { serials, err := c.employeeSerialsService.Generate( generateData.CompanyName, - generateData.Department, + generateData.Position, generateData.EmployeeName, generateData.Quantity, userModel.ID, diff --git a/models/models.go b/models/models.go index eaab9f8..571bad1 100644 --- a/models/models.go +++ b/models/models.go @@ -182,7 +182,7 @@ type EmployeeSerial struct { ID uint `gorm:"primaryKey" json:"id"` SerialNumber string `gorm:"uniqueIndex;size:255" json:"serialNumber"` CompanyName string `gorm:"index;size:255" json:"companyName"` - Department string `gorm:"size:255" json:"department"` + Position string `gorm:"size:255" json:"position"` EmployeeName string `gorm:"size:255" json:"employeeName"` IsActive bool `gorm:"default:true" json:"isActive"` CreatedBy *uint `json:"createdBy"` @@ -196,7 +196,7 @@ type EmployeeSerial struct { // GenerateEmployeeSerialDTO 生成员工序列号请求数据 type GenerateEmployeeSerialDTO struct { CompanyName string `json:"companyName" validate:"required"` - Department string `json:"department" validate:"required"` + Position string `json:"position" validate:"required"` EmployeeName string `json:"employeeName" validate:"required"` Quantity int `json:"quantity" validate:"min=1,max=1000"` SerialPrefix string `json:"serialPrefix,omitempty"` @@ -205,7 +205,7 @@ type GenerateEmployeeSerialDTO struct { // UpdateEmployeeSerialDTO 员工序列号更新请求数据 type UpdateEmployeeSerialDTO struct { CompanyName string `json:"companyName,omitempty" validate:"omitempty"` - Department string `json:"department,omitempty" validate:"omitempty"` + Position string `json:"position,omitempty" validate:"omitempty"` EmployeeName string `json:"employeeName,omitempty" validate:"omitempty"` IsActive *bool `json:"isActive,omitempty"` } diff --git a/services/companies_service.go b/services/companies_service.go index 69f5400..4d09604 100644 --- a/services/companies_service.go +++ b/services/companies_service.go @@ -380,7 +380,7 @@ func (s *CompaniesService) GetStats() (map[string]any, error) { "isActive": serial.IsActive, "createdAt": serial.CreatedAt, "type": "employee", - "department": serial.Department, + "position": serial.Position, "employeeName": serial.EmployeeName, }) } diff --git a/services/employees_service.go b/services/employees_service.go index 20c278d..ae9c8f4 100644 --- a/services/employees_service.go +++ b/services/employees_service.go @@ -24,7 +24,7 @@ type EmployeeSerialsService struct{} // Generate 生成员工序列号 func (s *EmployeeSerialsService) Generate( companyName string, - department string, + position string, employeeName string, quantity int, userId uint, @@ -79,7 +79,7 @@ func (s *EmployeeSerialsService) Generate( serial := models.EmployeeSerial{ SerialNumber: strings.ToUpper(serialNumber), CompanyName: companyName, - Department: department, + Position: position, EmployeeName: employeeName, CreatedBy: &userId, IsActive: true, @@ -163,8 +163,8 @@ func (s *EmployeeSerialsService) Update(serialNumber string, updateData models.U serial.CompanyName = updateData.CompanyName } - if updateData.Department != "" { - serial.Department = updateData.Department + if updateData.Position != "" { + serial.Position = updateData.Position } if updateData.EmployeeName != "" {