作者 tangxvhui

调整字段输出

... ... @@ -250,7 +250,18 @@ func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvalua
}
// 评估项截止时间
endTime := sEvaluation.EndTime.Local().Format("2006-01-02 15:04:05")
return map[string]interface{}{"endTime": endTime, "version": sEvaluation.Version, "list": itemValuesAdapter}, nil
result := map[string]interface{}{"endTime": endTime, "version": sEvaluation.Version, "status": sEvaluation.Status, "list": itemValuesAdapter}
if sEvaluation.CompletedAt == 0 {
result["status"] = string(domain.EvaluationUncompleted) //未完成
} else {
if sEvaluation.EndTime.Unix() < sEvaluation.CompletedAt {
result["status"] = string(domain.EvaluationCompleted) + "_timeout" //超时完成
} else {
result["status"] = string(domain.EvaluationCompleted) // 正常完成
}
}
return result, nil
}
// GetEvaluation360Complete 获取360综评详情(他人评估目标用户)(已完成状态)
... ... @@ -548,7 +559,17 @@ func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvalu
// 评估项截止时间
endTime := sEvaluation.EndTime.Local().Format("2006-01-02 15:04:05")
return map[string]interface{}{"endTime": endTime, "version": sEvaluation.Version, "list": itemValuesAdapter}, nil
result := map[string]interface{}{"endTime": endTime, "version": sEvaluation.Version, "status": "", "list": itemValuesAdapter}
if sEvaluation.CompletedAt == 0 {
result["status"] = string(domain.EvaluationUncompleted) //未完成
} else {
if sEvaluation.EndTime.Unix() < sEvaluation.CompletedAt {
result["status"] = string(domain.EvaluationCompleted) + "_timeout" //超时完成
} else {
result["status"] = string(domain.EvaluationCompleted) // 正常完成
}
}
return result, nil
}
// GetEvaluationHRBPComplete 获取人资综评详情(已完成状态)
... ...