正在显示
2 个修改的文件
包含
5 行增加
和
7 行删除
@@ -1117,6 +1117,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU | @@ -1117,6 +1117,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU | ||
1117 | "status": string(v.Status), | 1117 | "status": string(v.Status), |
1118 | "types": string(v.Types), | 1118 | "types": string(v.Types), |
1119 | "endTime": v.EndTime.Local().Format("2006-01-02 15:04:05"), | 1119 | "endTime": v.EndTime.Local().Format("2006-01-02 15:04:05"), |
1120 | + "assessId": strconv.Itoa(v.Id), | ||
1120 | } | 1121 | } |
1121 | listData = append(listData, m) | 1122 | listData = append(listData, m) |
1122 | } | 1123 | } |
@@ -1327,6 +1328,9 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada | @@ -1327,6 +1328,9 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada | ||
1327 | DutyTime: "", | 1328 | DutyTime: "", |
1328 | AssessContent: assessContentList, | 1329 | AssessContent: assessContentList, |
1329 | } | 1330 | } |
1331 | + if len(assessContentList) == 0 { | ||
1332 | + result.AssessContent = []*domain.StaffAssessContent{} | ||
1333 | + } | ||
1330 | if targetUserDesc != nil { | 1334 | if targetUserDesc != nil { |
1331 | result.CompanyName = targetUserDesc.CompanyName | 1335 | result.CompanyName = targetUserDesc.CompanyName |
1332 | result.SupperUser = targetUserDesc.SupperUserName | 1336 | result.SupperUser = targetUserDesc.SupperUserName |
@@ -1335,12 +1339,6 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada | @@ -1335,12 +1339,6 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada | ||
1335 | return &result, nil | 1339 | return &result, nil |
1336 | } | 1340 | } |
1337 | 1341 | ||
1338 | -// 获取员工的某次评估任务的360评估记录录 | ||
1339 | -// assessTaskId targetUserId | ||
1340 | -func (srv StaffAssessServeice) AssessInviteList() error { | ||
1341 | - return nil | ||
1342 | -} | ||
1343 | - | ||
1344 | // 获取员工信息描述 | 1342 | // 获取员工信息描述 |
1345 | func (srv *StaffAssessServeice) getStaffDescrip(transactionContext application.TransactionContext, userid int64) (*adapter.StaffInfo, error) { | 1343 | func (srv *StaffAssessServeice) getStaffDescrip(transactionContext application.TransactionContext, userid int64) (*adapter.StaffInfo, error) { |
1346 | //获取用户数据 | 1344 | //获取用户数据 |
@@ -7,7 +7,7 @@ type StaffAssessType string | @@ -7,7 +7,7 @@ type StaffAssessType string | ||
7 | 7 | ||
8 | const ( | 8 | const ( |
9 | AssessSelf StaffAssessType = "self" //自评 | 9 | AssessSelf StaffAssessType = "self" //自评 |
10 | - AssessSuper StaffAssessType = "super" //上级评估 | 10 | + AssessSuper StaffAssessType = "supper" //上级评估 |
11 | AssessInviteSameSuper StaffAssessType = "invite_same_super" //360 邀请评估-相同上级的同事 | 11 | AssessInviteSameSuper StaffAssessType = "invite_same_super" //360 邀请评估-相同上级的同事 |
12 | AssessInviteDiffSuper StaffAssessType = "invite_diff_super" //360 邀请评估-不同上级的同事 | 12 | AssessInviteDiffSuper StaffAssessType = "invite_diff_super" //360 邀请评估-不同上级的同事 |
13 | ) | 13 | ) |
-
请 注册 或 登录 后发表评论