Change department to position
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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"`
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -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 != "" {
|
||||
|
||||
Reference in New Issue
Block a user