作者 tangxvhui

Merge branch 'v2.2.0-fix' into test

@@ -166,6 +166,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -166,6 +166,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
166 } 166 }
167 167
168 evalutionHrbp.HrCheckResult = domain.EvaluationCheckCompleted 168 evalutionHrbp.HrCheckResult = domain.EvaluationCheckCompleted
  169 + evalutionHrbp.Status = domain.EvaluationCompleted
169 err = evaluationRepo.Save(evalutionHrbp) 170 err = evaluationRepo.Save(evalutionHrbp)
170 if err != nil { 171 if err != nil {
171 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 172 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
@@ -206,7 +207,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -206,7 +207,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
206 if err != nil { 207 if err != nil {
207 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 208 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
208 } 209 }
209 - 210 + evalutionHrbp.Status = domain.EvaluationCompleted
210 evaluationSuper.HrCheckResult = domain.EvaluationCheckCompleted 211 evaluationSuper.HrCheckResult = domain.EvaluationCheckCompleted
211 err = evaluationRepo.Save(evaluationSuper) 212 err = evaluationRepo.Save(evaluationSuper)
212 if err != nil { 213 if err != nil {
@@ -227,7 +228,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -227,7 +228,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
227 if err != nil { 228 if err != nil {
228 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 229 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
229 } 230 }
230 - 231 + evalutionHrbp.Status = domain.EvaluationCompleted
231 evalutionFinish.HrCheckResult = domain.EvaluationCheckCompleted 232 evalutionFinish.HrCheckResult = domain.EvaluationCheckCompleted
232 err = evaluationRepo.Save(evalutionFinish) 233 err = evaluationRepo.Save(evalutionFinish)
233 if err != nil { 234 if err != nil {
  1 +UPDATE
  2 + summary_evaluation
  3 +SET
  4 + status = 'completed'
  5 +WHERE
  6 + hr_check_result = 'completed'