正在显示
1 个修改的文件
包含
16 行增加
和
13 行删除
@@ -673,10 +673,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain. | @@ -673,10 +673,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain. | ||
673 | // 进入考核结果阶段 | 673 | // 进入考核结果阶段 |
674 | if evaluationList[0].BeginTime.After(nowTime) { | 674 | if evaluationList[0].BeginTime.After(nowTime) { |
675 | evaluationList[0].BeginTime = nowTime | 675 | evaluationList[0].BeginTime = nowTime |
676 | - err = evaluationRepo.Save(evaluationList[0]) | ||
677 | - if err != nil { | ||
678 | - return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | ||
679 | - } | 676 | + } |
677 | + evaluationList[0].Status = domain.EvaluationCompleted | ||
678 | + err = evaluationRepo.Save(evaluationList[0]) | ||
679 | + if err != nil { | ||
680 | + return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | ||
680 | } | 681 | } |
681 | } | 682 | } |
682 | } | 683 | } |
@@ -735,7 +736,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma | @@ -735,7 +736,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma | ||
735 | "targetUserId": param.TargetUser.UserId, | 736 | "targetUserId": param.TargetUser.UserId, |
736 | "typesList": []int{int(domain.EvaluationSuper)}, | 737 | "typesList": []int{int(domain.EvaluationSuper)}, |
737 | "cycleId": param.CycleId, | 738 | "cycleId": param.CycleId, |
738 | - "limit": 10, | 739 | + "limit": 1, |
739 | }) | 740 | }) |
740 | if err != nil { | 741 | if err != nil { |
741 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 742 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
@@ -771,10 +772,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma | @@ -771,10 +772,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma | ||
771 | if len(evaluationList) > 0 { | 772 | if len(evaluationList) > 0 { |
772 | if evaluationList[0].BeginTime.After(nowTime) { | 773 | if evaluationList[0].BeginTime.After(nowTime) { |
773 | evaluationList[0].BeginTime = nowTime | 774 | evaluationList[0].BeginTime = nowTime |
774 | - err = evaluationRepo.Save(evaluationList[0]) | ||
775 | - if err != nil { | ||
776 | - return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | ||
777 | - } | 775 | + } |
776 | + evaluationList[0].Status = domain.EvaluationCompleted | ||
777 | + err = evaluationRepo.Save(evaluationList[0]) | ||
778 | + if err != nil { | ||
779 | + return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | ||
778 | } | 780 | } |
779 | } | 781 | } |
780 | } | 782 | } |
@@ -824,10 +826,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain | @@ -824,10 +826,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain | ||
824 | if len(evaluationList) > 0 { | 826 | if len(evaluationList) > 0 { |
825 | if evaluationList[0].BeginTime.After(nowTime) { | 827 | if evaluationList[0].BeginTime.After(nowTime) { |
826 | evaluationList[0].BeginTime = nowTime | 828 | evaluationList[0].BeginTime = nowTime |
827 | - err = evaluationRepo.Save(evaluationList[0]) | ||
828 | - if err != nil { | ||
829 | - return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | ||
830 | - } | 829 | + } |
830 | + evaluationList[0].Status = domain.EvaluationCompleted | ||
831 | + err = evaluationRepo.Save(evaluationList[0]) | ||
832 | + if err != nil { | ||
833 | + return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | ||
831 | } | 834 | } |
832 | } | 835 | } |
833 | if err := transactionContext.CommitTransaction(); err != nil { | 836 | if err := transactionContext.CommitTransaction(); err != nil { |
-
请 注册 或 登录 后发表评论