正在显示
2 个修改的文件
包含
16 行增加
和
4 行删除
@@ -234,7 +234,12 @@ func (srv StaffAssessServeice) ListAssessInviteUserV2(param *query.ListInviteUse | @@ -234,7 +234,12 @@ func (srv StaffAssessServeice) ListAssessInviteUserV2(param *query.ListInviteUse | ||
234 | assessReps := factory.CreateStaffAssessRepository(map[string]interface{}{ | 234 | assessReps := factory.CreateStaffAssessRepository(map[string]interface{}{ |
235 | "transactionContext": transactionContext, | 235 | "transactionContext": transactionContext, |
236 | }) | 236 | }) |
237 | - | 237 | + companyReps := factory.CreateCompanyRepository(map[string]interface{}{ |
238 | + "transactionContext": transactionContext, | ||
239 | + }) | ||
240 | + companyInfo, _ := companyReps.FindOne(map[string]interface{}{ | ||
241 | + "id": param.CompanyId, | ||
242 | + }) | ||
238 | assessTaskRepo := factory.CreateStaffAssessTaskRepository(map[string]interface{}{ | 243 | assessTaskRepo := factory.CreateStaffAssessTaskRepository(map[string]interface{}{ |
239 | "transactionContext": transactionContext, | 244 | "transactionContext": transactionContext, |
240 | }) | 245 | }) |
@@ -281,11 +286,17 @@ func (srv StaffAssessServeice) ListAssessInviteUserV2(param *query.ListInviteUse | @@ -281,11 +286,17 @@ func (srv StaffAssessServeice) ListAssessInviteUserV2(param *query.ListInviteUse | ||
281 | result.EndTime = v.EndTime.Local().Format("2006-01-02 15:04:05") | 286 | result.EndTime = v.EndTime.Local().Format("2006-01-02 15:04:05") |
282 | break | 287 | break |
283 | } | 288 | } |
289 | + companyName := "" | ||
290 | + if companyInfo != nil { | ||
291 | + companyName = companyInfo.Name | ||
292 | + } | ||
284 | for _, v := range assessList { | 293 | for _, v := range assessList { |
285 | if v.Types == domain.AssessInviteDiffSuper { | 294 | if v.Types == domain.AssessInviteDiffSuper { |
295 | + v.Executor.CompanyName = companyName | ||
286 | result.InviteDiffSuper = append(result.InviteDiffSuper, v.Executor) | 296 | result.InviteDiffSuper = append(result.InviteDiffSuper, v.Executor) |
287 | } | 297 | } |
288 | if v.Types == domain.AssessInviteSameSuper { | 298 | if v.Types == domain.AssessInviteSameSuper { |
299 | + v.Executor.CompanyName = companyName | ||
289 | result.InviteSameSuper = append(result.InviteSameSuper, v.Executor) | 300 | result.InviteSameSuper = append(result.InviteSameSuper, v.Executor) |
290 | } | 301 | } |
291 | } | 302 | } |
@@ -2,9 +2,10 @@ package domain | @@ -2,9 +2,10 @@ package domain | ||
2 | 2 | ||
3 | //员工基本信息描述 | 3 | //员工基本信息描述 |
4 | type StaffDesc struct { | 4 | type StaffDesc struct { |
5 | - UserId int `json:"userId,string"` //用户id | ||
6 | - Account string `json:"account"` //用户的账号 | ||
7 | - UserName string `json:"userName"` //用户的名称 | 5 | + UserId int `json:"userId,string"` //用户id |
6 | + CompanyName string `json:"companyName"` //公司名称 | ||
7 | + Account string `json:"account"` //用户的账号 | ||
8 | + UserName string `json:"userName"` //用户的名称 | ||
8 | } | 9 | } |
9 | 10 | ||
10 | //员工的部门 | 11 | //员工的部门 |
-
请 注册 或 登录 后发表评论