作者 郑周

Merge branch 'dev-zhengzhou' into test

... ... @@ -191,7 +191,7 @@ func (srv *SummaryEvaluationService) Evaluation360List(param *command.QueryEvalu
}
// GetEvaluation360 获取360综评详情(我评估目标用户)
func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvaluation360My) (*[]adapter.EvaluationItemAdapter, error) {
func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvaluation360My) (map[string]interface{}, error) {
transactionContext, err := factory.ValidateStartTransaction(param)
if err != nil {
return nil, err
... ... @@ -237,21 +237,9 @@ func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvalua
for i := range itemValuesAdapter { // 评估人名称赋值
itemValuesAdapter[i].EvaluatorName = sEvaluation.Executor.UserName
}
//result := adapter.EvaluationInfoAdapter{
// SummaryEvaluationId: sEvaluation.Id,
// CycleId: int(sEvaluation.CycleId),
// CycleName: sEvaluation.CycleName,
// EvaluationProjectId: sEvaluation.EvaluationProjectId,
// EvaluationProjectName: sEvaluation.EvaluationProjectName,
// LinkNodeId: sEvaluation.NodeId,
// BeginTime: sEvaluation.BeginTime.Format("2006-01-02 15:04:05"),
// EndTime: sEvaluation.EndTime.Format("2006-01-02 15:04:05"),
// TargetUserId: sEvaluation.TargetUser.UserId,
// TargetUserName: sEvaluation.TargetUser.UserName,
// Status: string(sEvaluation.Status),
// EvaluationItems: itemValuesAdapter,
//}
return &itemValuesAdapter, nil
// 评估项截止时间
endTime := sEvaluation.EndTime.Local().Format("2006-01-02 15:04:05")
return map[string]interface{}{"endTime": endTime, "list": itemValuesAdapter}, nil
}
// GetEvaluation360Complete 获取360综评详情(他人评估目标用户)(已完成状态)
... ... @@ -598,7 +586,7 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval
}
// GetEvaluationHRBP 获取人资综评详情
func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvaluationHRBPMy) (*[]adapter.EvaluationItemAdapter, error) {
func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvaluationHRBPMy) (map[string]interface{}, error) {
transactionContext, err := factory.ValidateStartTransaction(param)
if err != nil {
return nil, err
... ... @@ -640,7 +628,10 @@ func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvalu
for i := range itemValuesAdapter { // 评估人名称赋值
itemValuesAdapter[i].EvaluatorName = sEvaluation.Executor.UserName
}
return &itemValuesAdapter, nil
// 评估项截止时间
endTime := sEvaluation.EndTime.Local().Format("2006-01-02 15:04:05")
return map[string]interface{}{"endTime": endTime, "list": itemValuesAdapter}, nil
}
// GetEvaluationHRBPComplete 获取人资综评详情(已完成状态)
... ...