allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 fa2257b1ec456af67be14e48f865e20773fac3a3 1 个父辈 bfe9eea6

更新考核结果的开始时间

内嵌 并排对比
正在显示 1 个修改的文件 包含 8 行增加 和 11 行删除
@@ -657,10 +657,9 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain. @@ -657,10 +657,9 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain.
657 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 657 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
658 } 658 }
659 if len(evaluationList) > 0 { 659 if len(evaluationList) > 0 {
660 - // 进入考核结果阶段  
661 - if evaluationList[0].BeginTime.After(nowTime) {  
662 - evaluationList[0].BeginTime = nowTime  
663 - } 660 + //进入考核结果
  661 + //自评的结束时间
  662 + evaluationList[0].BeginTime = param.EndTime
664 evaluationList[0].Status = domain.EvaluationCompleted 663 evaluationList[0].Status = domain.EvaluationCompleted
665 err = evaluationRepo.Save(evaluationList[0]) 664 err = evaluationRepo.Save(evaluationList[0])
666 if err != nil { 665 if err != nil {
@@ -757,9 +756,8 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma @@ -757,9 +756,8 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma
757 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 756 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
758 } 757 }
759 if len(evaluationList) > 0 { 758 if len(evaluationList) > 0 {
760 - if evaluationList[0].BeginTime.After(nowTime) {  
761 - evaluationList[0].BeginTime = nowTime  
762 - } 759 + //360评估的结束时间
  760 + evaluationList[0].BeginTime = param.EndTime
763 evaluationList[0].Status = domain.EvaluationCompleted 761 evaluationList[0].Status = domain.EvaluationCompleted
764 err = evaluationRepo.Save(evaluationList[0]) 762 err = evaluationRepo.Save(evaluationList[0])
765 if err != nil { 763 if err != nil {
@@ -809,11 +807,10 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain @@ -809,11 +807,10 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain
809 if err != nil { 807 if err != nil {
810 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 808 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
811 } 809 }
812 - nowTime := time.Now() 810 +
813 if len(evaluationList) > 0 { 811 if len(evaluationList) > 0 {
814 - if evaluationList[0].BeginTime.After(nowTime) {  
815 - evaluationList[0].BeginTime = nowTime  
816 - } 812 + //上级评估的结束时间
  813 + evaluationList[0].BeginTime = param.EndTime
817 evaluationList[0].Status = domain.EvaluationCompleted 814 evaluationList[0].Status = domain.EvaluationCompleted
818 err = evaluationRepo.Save(evaluationList[0]) 815 err = evaluationRepo.Save(evaluationList[0])
819 if err != nil { 816 if err != nil {