正在显示
2 个修改的文件
包含
5 行增加
和
0 行删除
@@ -8,6 +8,7 @@ type SaveUserCommand struct { | @@ -8,6 +8,7 @@ type SaveUserCommand struct { | ||
8 | AdminType int `json:"admin_type"` // 1普通员工 2 主管理员 | 8 | AdminType int `json:"admin_type"` // 1普通员工 2 主管理员 |
9 | Name string `json:"name"` // 用户姓名 | 9 | Name string `json:"name"` // 用户姓名 |
10 | Status int `json:"status"` // 用户状态(1正常 2禁用) | 10 | Status int `json:"status"` // 用户状态(1正常 2禁用) |
11 | + EntryTime string `json:"entryTime"` //入职日期 | ||
11 | Email string `json:"email"` // 邮箱 | 12 | Email string `json:"email"` // 邮箱 |
12 | UserDepartments []struct { | 13 | UserDepartments []struct { |
13 | DepartmentId int `json:"department_id" ` | 14 | DepartmentId int `json:"department_id" ` |
@@ -102,6 +102,7 @@ func (srv SyncDataUserService) AddUser(param *command.SaveUserCommand) error { | @@ -102,6 +102,7 @@ func (srv SyncDataUserService) AddUser(param *command.SaveUserCommand) error { | ||
102 | Name: param.Name, | 102 | Name: param.Name, |
103 | Email: param.Email, | 103 | Email: param.Email, |
104 | Status: param.Status, | 104 | Status: param.Status, |
105 | + EntryTime: param.EntryTime, | ||
105 | UpdatedAt: nowTime, | 106 | UpdatedAt: nowTime, |
106 | CreatedAt: nowTime, | 107 | CreatedAt: nowTime, |
107 | } | 108 | } |
@@ -160,6 +161,7 @@ func (srv SyncDataUserService) UpdateUser(param *command.SaveUserCommand) error | @@ -160,6 +161,7 @@ func (srv SyncDataUserService) UpdateUser(param *command.SaveUserCommand) error | ||
160 | newUser.AdminType = param.AdminType | 161 | newUser.AdminType = param.AdminType |
161 | newUser.Name = param.Name | 162 | newUser.Name = param.Name |
162 | newUser.Status = param.Status | 163 | newUser.Status = param.Status |
164 | + newUser.EntryTime = param.EntryTime | ||
163 | newUser.PositionId = param.PositionIds() | 165 | newUser.PositionId = param.PositionIds() |
164 | newUser.DepartmentId = param.DepartmentIds() | 166 | newUser.DepartmentId = param.DepartmentIds() |
165 | 167 | ||
@@ -294,6 +296,7 @@ func (srv SyncDataUserService) importUser(param *command.ImportUserCommand) erro | @@ -294,6 +296,7 @@ func (srv SyncDataUserService) importUser(param *command.ImportUserCommand) erro | ||
294 | editUserList[i].Name = mVal.Name | 296 | editUserList[i].Name = mVal.Name |
295 | editUserList[i].Status = mVal.Status | 297 | editUserList[i].Status = mVal.Status |
296 | editUserList[i].CompanyId = mVal.CompanyId | 298 | editUserList[i].CompanyId = mVal.CompanyId |
299 | + editUserList[i].EntryTime = mVal.EntryTime | ||
297 | editUserList[i].UpdatedAt = nowTime | 300 | editUserList[i].UpdatedAt = nowTime |
298 | _, err = userRepo.Update(editUserList[i]) | 301 | _, err = userRepo.Update(editUserList[i]) |
299 | if err != nil { | 302 | if err != nil { |
@@ -312,6 +315,7 @@ func (srv SyncDataUserService) importUser(param *command.ImportUserCommand) erro | @@ -312,6 +315,7 @@ func (srv SyncDataUserService) importUser(param *command.ImportUserCommand) erro | ||
312 | AdminType: param.AddUsers[i].AdminType, | 315 | AdminType: param.AddUsers[i].AdminType, |
313 | Name: param.AddUsers[i].Name, | 316 | Name: param.AddUsers[i].Name, |
314 | Status: param.AddUsers[i].Status, | 317 | Status: param.AddUsers[i].Status, |
318 | + EntryTime: param.AddUsers[i].EntryTime, | ||
315 | UpdatedAt: nowTime, | 319 | UpdatedAt: nowTime, |
316 | DeletedAt: nil, | 320 | DeletedAt: nil, |
317 | CreatedAt: nowTime, | 321 | CreatedAt: nowTime, |
-
请 注册 或 登录 后发表评论