作者 tangxvhui

修复bug

@@ -230,6 +230,10 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp( @@ -230,6 +230,10 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(
230 evaluationFinishList[0].BeginTime = nowTime 230 evaluationFinishList[0].BeginTime = nowTime
231 } 231 }
232 evaluationFinishList[0].Status = domain.EvaluationCompleted 232 evaluationFinishList[0].Status = domain.EvaluationCompleted
  233 + err = evaluationRepo.Save(evaluationFinishList[0])
  234 + if err != nil {
  235 + return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error())
  236 + }
233 //添加确认绩效成绩提醒短信提醒 237 //添加确认绩效成绩提醒短信提醒
234 err = notify.AddNotifyConfirmEvaluationScore(evaluationFinishList[0]) 238 err = notify.AddNotifyConfirmEvaluationScore(evaluationFinishList[0])
235 if err != nil { 239 if err != nil {
@@ -237,17 +241,17 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp( @@ -237,17 +241,17 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(
237 } 241 }
238 } 242 }
239 } 243 }
240 - if noSuper && len(evaluationFinishList) > 0 { 244 + // if noSuper && len(evaluationFinishList) > 0 {
241 //不存在上级评估 245 //不存在上级评估
242 // err = srv.syncEvaluationFinishValue(transactionContext, evaluationFinishList[0], evaluationValue) 246 // err = srv.syncEvaluationFinishValue(transactionContext, evaluationFinishList[0], evaluationValue)
243 // if err != nil { 247 // if err != nil {
244 // return err 248 // return err
245 // } 249 // }
246 - } else if len(evaluationList) == 0 && len(evaluationFinishList) > 0 {  
247 - err = evaluationRepo.Save(evaluationFinishList[0])  
248 - if err != nil {  
249 - return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error())  
250 - }  
251 - } 250 + // } else if len(evaluationList) == 0 && len(evaluationFinishList) > 0 {
  251 + // err = evaluationRepo.Save(evaluationFinishList[0])
  252 + // if err != nil {
  253 + // return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error())
  254 + // }
  255 + // }
252 return nil 256 return nil
253 } 257 }
@@ -192,6 +192,10 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf( @@ -192,6 +192,10 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(
192 evaluationFinish.BeginTime = nowTime 192 evaluationFinish.BeginTime = nowTime
193 } 193 }
194 evaluationFinish.Status = domain.EvaluationCompleted 194 evaluationFinish.Status = domain.EvaluationCompleted
  195 + err = evaluationRepo.Save(evaluationFinish)
  196 + if err != nil {
  197 + return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error())
  198 + }
195 //添加确认绩效成绩提醒短信提醒 199 //添加确认绩效成绩提醒短信提醒
196 err = notify.AddNotifyConfirmEvaluationScore(evaluationFinish) 200 err = notify.AddNotifyConfirmEvaluationScore(evaluationFinish)
197 if err != nil { 201 if err != nil {
@@ -199,8 +203,8 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf( @@ -199,8 +203,8 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(
199 } 203 }
200 } 204 }
201 } 205 }
202 -  
203 - if noSuper && evaluationFinish != nil { 206 + _ = noSuper
  207 + // if noSuper && evaluationFinish != nil {
204 //没有上级评估 同步数据到考核结果 208 //没有上级评估 同步数据到考核结果
205 209
206 // itemUsedRepo := factory.CreateEvaluationItemUsedRepository(map[string]interface{}{ 210 // itemUsedRepo := factory.CreateEvaluationItemUsedRepository(map[string]interface{}{
@@ -232,12 +236,12 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf( @@ -232,12 +236,12 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(
232 // return err 236 // return err
233 // } 237 // }
234 238
235 - } else if len(targetEvaluation) == 0 && evaluationFinish != nil {  
236 - err = evaluationRepo.Save(evaluationFinish)  
237 - if err != nil {  
238 - return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error())  
239 - }  
240 - } 239 + // } else if len(targetEvaluation) == 0 && evaluationFinish != nil {
  240 + // err = evaluationRepo.Save(evaluationFinish)
  241 + // if err != nil {
  242 + // return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error())
  243 + // }
  244 + // }
241 245
242 return nil 246 return nil
243 } 247 }