作者 tangxvhui

修正 菜单描述

... ... @@ -107,7 +107,7 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
//查询上级评估,统计未完成
//查询需要执行上级评估,统计未完成
cntSuper, _, err := evaluationRepo.Find(map[string]interface{}{
"types": int(domain.EvaluationSuper),
"executorId": param.UserId,
... ... @@ -118,13 +118,12 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
//查询人资评估,统计未完成
//查询需要执行人资评估,统计未完成
cntHrbp, _, err := evaluationRepo.Find(map[string]interface{}{
"types": int(domain.EvaluationHrbp),
"executorId": param.UserId,
"limit": 1,
"cycleId": param.CycleId,
"status": string(domain.EvaluationUncompleted),
"types": int(domain.EvaluationHrbp),
"limit": 1,
"cycleId": param.CycleId,
"status": string(domain.EvaluationUncompleted),
})
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
... ... @@ -135,7 +134,13 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
//查找当前周期,我的考核结果,人资评估
//查找当前周期,我的考核结果
_, myEvaluationSuper, err := evaluationRepo.Find(map[string]interface{}{
"types": int(domain.EvaluationSuper),
"limit": 1,
"targetUserId": param.UserId,
"cycleId": param.CycleId,
})
if err := transactionContext.CommitTransaction(); err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
... ... @@ -170,7 +175,10 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
} else {
menu1_1.StatusName = "未完成"
}
if selfEvaluation[0].CheckResult == domain.EvaluationCheckCompleted {
}
if len(myEvaluationSuper) > 0 {
if myEvaluationSuper[0].CheckResult == domain.EvaluationCheckCompleted {
menu1_2.StatusName = "已完成"
} else {
menu1_2.StatusName = "未完成"
... ...