作者 tangxvhui
... ... @@ -1689,6 +1689,14 @@ func (srv *SummaryEvaluationService) GetTargetEvaluationResult(param *command.Qu
// 基础数据
evaluationBase := srv.getSummaryEvaluation(transactionContext, result)
// 未完成考核,需要重新计算分数
if result.CheckResult == domain.EvaluationCheckUncompleted {
if err = result.EvaluationTotalScore(itemValues); err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
}
if err := transactionContext.CommitTransaction(); err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
... ... @@ -1698,6 +1706,9 @@ func (srv *SummaryEvaluationService) GetTargetEvaluationResult(param *command.Qu
codeList := make([]*adapter.LevalCodeCount, 0)
codeMap := map[string]*adapter.LevalCodeCount{}
for _, v := range itemValuesAdapter {
if len(v.Value) == 0 {
continue
}
if v.Weight == 0 {
if _, ok := codeMap[v.Value]; !ok {
code := &adapter.LevalCodeCount{
... ...