作者 tangxvhui

修复 问题,评估内容 未顺利保存。

... ... @@ -110,8 +110,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
if evalutionHrbp != nil && val.EvaluatorId == -1 {
newItemValue := domain.SummaryEvaluationValue{}
newItemValue.SetBlankValue(evalutionHrbp, val)
newItemValue.Remark = itemValueParam[val.Id].Remark
evalutionHrbp.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
newItemValue.Remark = itemValueParam[val.Id].Remark
newItemValue.HrCheck = param.ExecutorId
newHrbpItemValueList = append(newHrbpItemValueList, &newItemValue)
temp = newItemValue
... ... @@ -126,8 +126,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
}
newItemValue := domain.SummaryEvaluationValue{}
newItemValue.SetBlankValue(evaluation360, val)
newItemValue.Remark = itemValueParam[val.Id].Remark
evaluation360.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
newItemValue.Remark = itemValueParam[val.Id].Remark
newItemValue.HrCheck = param.ExecutorId
itemValue360List = append(itemValue360List, &newItemValue)
new360ItemValueList[evaluation360.Executor.UserId] = itemValue360List
... ... @@ -138,8 +138,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
if evaluationSuper != nil {
newItemValue := domain.SummaryEvaluationValue{}
newItemValue.SetBlankValue(evaluationSuper, val)
newItemValue.Remark = itemValueParam[val.Id].Remark
evaluationSuper.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
newItemValue.Remark = itemValueParam[val.Id].Remark
newItemValue.HrCheck = param.ExecutorId
newSuperItemValueList = append(newSuperItemValueList, &newItemValue)
temp = newItemValue
... ... @@ -148,8 +148,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
if evalutionFinish != nil {
newItemValue := domain.SummaryEvaluationValue{}
newItemValue.SetBlankValue(evalutionFinish, val)
newItemValue.Remark = itemValueParam[val.Id].Remark
evalutionFinish.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
newItemValue.Remark = itemValueParam[val.Id].Remark
newItemValue.HrCheck = param.ExecutorId
newFinishItemValueList = append(newFinishItemValueList, &newItemValue)
}
... ...
... ... @@ -233,11 +233,12 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua
}
}
//填充评估填写值
newItemValue.Remark = v.Remark
err := summaryEvaluation.FillItemValue(evaluationItem, newItemValue, v.Value)
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
}
newItemValue.Remark = v.Remark
}
summaryEvaluation.EvaluationTotalScore(evaluationValueSlice)
}
... ...
... ... @@ -360,11 +360,11 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu
}
}
//填充评估填写值
newItemValue.Remark = v.Remark
err := summaryEvaluation.FillItemValue(evaluationItem, newItemValue, v.Value)
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
}
newItemValue.Remark = v.Remark
}
summaryEvaluation.EvaluationTotalScore(evaluationValueSlice)
}
... ...
... ... @@ -309,11 +309,11 @@ func (srv *SummaryEvaluationService) EditEvaluationSelfV2(param *command.EditEva
}
}
//填充评估填写值
newItemValue.Remark = v.Remark
err := evaluationData.FillItemValue(evaluationItem, newItemValue, v.Value)
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
}
newItemValue.Remark = v.Remark
}
evaluationData.EvaluationTotalScore(evaluationValueSlice)
}
... ...
... ... @@ -412,11 +412,11 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval
}
}
//填充评估填写值
newItemValue.Remark = v.Remark
err := evaluationData.FillItemValue(evaluationItem, newItemValue, v.Value)
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
}
newItemValue.Remark = v.Remark
}
// 填入固定的默认值
for _, v := range hrbpOr360ItemValue {
... ...