正在显示
1 个修改的文件
包含
7 行增加
和
4 行删除
@@ -673,13 +673,14 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain. | @@ -673,13 +673,14 @@ 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 | + } | ||
677 | + evaluationList[0].Status = domain.EvaluationCompleted | ||
676 | err = evaluationRepo.Save(evaluationList[0]) | 678 | err = evaluationRepo.Save(evaluationList[0]) |
677 | if err != nil { | 679 | if err != nil { |
678 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | 680 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) |
679 | } | 681 | } |
680 | } | 682 | } |
681 | } | 683 | } |
682 | - } | ||
683 | if err := transactionContext.CommitTransaction(); err != nil { | 684 | if err := transactionContext.CommitTransaction(); err != nil { |
684 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 685 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
685 | } | 686 | } |
@@ -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,13 +772,14 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma | @@ -771,13 +772,14 @@ 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 |
775 | + } | ||
776 | + evaluationList[0].Status = domain.EvaluationCompleted | ||
774 | err = evaluationRepo.Save(evaluationList[0]) | 777 | err = evaluationRepo.Save(evaluationList[0]) |
775 | if err != nil { | 778 | if err != nil { |
776 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | 779 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) |
777 | } | 780 | } |
778 | } | 781 | } |
779 | } | 782 | } |
780 | - } | ||
781 | if err := transactionContext.CommitTransaction(); err != nil { | 783 | if err := transactionContext.CommitTransaction(); err != nil { |
782 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 784 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
783 | } | 785 | } |
@@ -824,12 +826,13 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain | @@ -824,12 +826,13 @@ 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 |
829 | + } | ||
830 | + evaluationList[0].Status = domain.EvaluationCompleted | ||
827 | err = evaluationRepo.Save(evaluationList[0]) | 831 | err = evaluationRepo.Save(evaluationList[0]) |
828 | if err != nil { | 832 | if err != nil { |
829 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | 833 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) |
830 | } | 834 | } |
831 | } | 835 | } |
832 | - } | ||
833 | if err := transactionContext.CommitTransaction(); err != nil { | 836 | if err := transactionContext.CommitTransaction(); err != nil { |
834 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 837 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
835 | } | 838 | } |
-
请 注册 或 登录 后发表评论