trace-system/backend-go
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change department to position

Browse Source
This commit is contained in:
郑肖毅
2026-03-02 14:01:52 +08:00
parent 4f18028a7b
commit e820b858bf
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/employees_controller.go
View File

@@ -48,7 +48,7 @@ func (c *EmployeeSerialsController) Generate(ctx *gin.Context) {
serials, err := c.employeeSerialsService.Generate( serials, err := c.employeeSerialsService.Generate(
generateData.CompanyName, generateData.CompanyName,
generateData.Department, generateData.Position,
generateData.EmployeeName, generateData.EmployeeName,
generateData.Quantity, generateData.Quantity,
userModel.ID, userModel.ID,

6
models/models.go
View File

@@ -182,7 +182,7 @@ type EmployeeSerial struct {
ID uint `gorm:"primaryKey" json:"id"` ID uint `gorm:"primaryKey" json:"id"`
SerialNumber string `gorm:"uniqueIndex;size:255" json:"serialNumber"` SerialNumber string `gorm:"uniqueIndex;size:255" json:"serialNumber"`
CompanyName string `gorm:"index;size:255" json:"companyName"` 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"` EmployeeName string `gorm:"size:255" json:"employeeName"`
IsActive bool `gorm:"default:true" json:"isActive"` IsActive bool `gorm:"default:true" json:"isActive"`
CreatedBy *uint `json:"createdBy"` CreatedBy *uint `json:"createdBy"`
@@ -196,7 +196,7 @@ type EmployeeSerial struct {
// GenerateEmployeeSerialDTO 生成员工序列号请求数据 // GenerateEmployeeSerialDTO 生成员工序列号请求数据
type GenerateEmployeeSerialDTO struct { type GenerateEmployeeSerialDTO struct {
CompanyName string `json:"companyName" validate:"required"` CompanyName string `json:"companyName" validate:"required"`
Department string `json:"department" validate:"required"` Position string `json:"position" validate:"required"`
EmployeeName string `json:"employeeName" validate:"required"` EmployeeName string `json:"employeeName" validate:"required"`
Quantity int `json:"quantity" validate:"min=1,max=1000"` Quantity int `json:"quantity" validate:"min=1,max=1000"`
SerialPrefix string `json:"serialPrefix,omitempty"` SerialPrefix string `json:"serialPrefix,omitempty"`
@@ -205,7 +205,7 @@ type GenerateEmployeeSerialDTO struct {
// UpdateEmployeeSerialDTO 员工序列号更新请求数据 // UpdateEmployeeSerialDTO 员工序列号更新请求数据
type UpdateEmployeeSerialDTO struct { type UpdateEmployeeSerialDTO struct {
CompanyName string `json:"companyName,omitempty" validate:"omitempty"` 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"` EmployeeName string `json:"employeeName,omitempty" validate:"omitempty"`
IsActive *bool `json:"isActive,omitempty"` IsActive *bool `json:"isActive,omitempty"`
} }

2
services/companies_service.go
View File

@@ -380,7 +380,7 @@ func (s *CompaniesService) GetStats() (map[string]any, error) {
"isActive": serial.IsActive, "isActive": serial.IsActive,
"createdAt": serial.CreatedAt, "createdAt": serial.CreatedAt,
"type": "employee", "type": "employee",
"department": serial.Department, "position": serial.Position,
"employeeName": serial.EmployeeName, "employeeName": serial.EmployeeName,
}) })
} }

8
services/employees_service.go
View File

@@ -24,7 +24,7 @@ type EmployeeSerialsService struct{}
// Generate 生成员工序列号 // Generate 生成员工序列号
func (s *EmployeeSerialsService) Generate( func (s *EmployeeSerialsService) Generate(
companyName string, companyName string,
department string, position string,
employeeName string, employeeName string,
quantity int, quantity int,
userId uint, userId uint,
@@ -79,7 +79,7 @@ func (s *EmployeeSerialsService) Generate(
serial := models.EmployeeSerial{ serial := models.EmployeeSerial{
SerialNumber: strings.ToUpper(serialNumber), SerialNumber: strings.ToUpper(serialNumber),
CompanyName: companyName, CompanyName: companyName,
Department: department, Position: position,
EmployeeName: employeeName, EmployeeName: employeeName,
CreatedBy: &userId, CreatedBy: &userId,
IsActive: true, IsActive: true,
@@ -163,8 +163,8 @@ func (s *EmployeeSerialsService) Update(serialNumber string, updateData models.U
serial.CompanyName = updateData.CompanyName serial.CompanyName = updateData.CompanyName
} }
if updateData.Department != "" { if updateData.Position != "" {
serial.Department = updateData.Department serial.Position = updateData.Position
} }
if updateData.EmployeeName != "" { if updateData.EmployeeName != "" {