allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 ba3cbee79a6bcbd25525086d126dd1fc4c90f00b 1 个父辈 f51390fd

修复bug

内嵌 并排对比
正在显示 1 个修改的文件 包含 14 行增加 和 11 行删除
@@ -648,7 +648,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain. @@ -648,7 +648,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain.
648 if len(evaluationList) == 0 { 648 if len(evaluationList) == 0 {
649 //没有上级评估、360评估、hrbp 评估 649 //没有上级评估、360评估、hrbp 评估
650 //直接进入考核结果阶段 650 //直接进入考核结果阶段
651 - _, evaluationList, err = evaluationRepo.Find(map[string]interface{}{ 651 + _, evaluationFinishList, err := evaluationRepo.Find(map[string]interface{}{
652 "targetUserId": param.TargetUser.UserId, 652 "targetUserId": param.TargetUser.UserId,
653 "typesList": []int{int(domain.EvaluationFinish)}, 653 "typesList": []int{int(domain.EvaluationFinish)},
654 "cycleId": param.CycleId, 654 "cycleId": param.CycleId,
@@ -657,12 +657,14 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain. @@ -657,12 +657,14 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain.
657 if err != nil { 657 if err != nil {
658 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 658 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
659 } 659 }
660 - if len(evaluationList) > 0 { 660 + if len(evaluationFinishList) > 0 {
661 //进入考核结果 661 //进入考核结果
662 //自评的结束时间 662 //自评的结束时间
663 - evaluationList[0].BeginTime = param.EndTime  
664 - evaluationList[0].Status = domain.EvaluationCompleted  
665 - err = evaluationRepo.Save(evaluationList[0]) 663 + if evaluationFinishList[0].BeginTime.After(nowTime) {
  664 + evaluationFinishList[0].BeginTime = nowTime
  665 + }
  666 + evaluationFinishList[0].Status = domain.EvaluationCompleted
  667 + err = evaluationRepo.Save(evaluationFinishList[0])
666 if err != nil { 668 if err != nil {
667 return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error()) 669 return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
668 } 670 }
@@ -747,7 +749,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma @@ -747,7 +749,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma
747 if len(evaluationList) == 0 { 749 if len(evaluationList) == 0 {
748 //没有上级评估 750 //没有上级评估
749 //直接进入考核结果阶段 751 //直接进入考核结果阶段
750 - _, evaluationList, err = evaluationRepo.Find(map[string]interface{}{ 752 + _, evaluationFinishList, err := evaluationRepo.Find(map[string]interface{}{
751 "targetUserId": param.TargetUser.UserId, 753 "targetUserId": param.TargetUser.UserId,
752 "typesList": []int{int(domain.EvaluationFinish)}, 754 "typesList": []int{int(domain.EvaluationFinish)},
753 "cycleId": param.CycleId, 755 "cycleId": param.CycleId,
@@ -756,11 +758,12 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma @@ -756,11 +758,12 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma
756 if err != nil { 758 if err != nil {
757 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 759 return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
758 } 760 }
759 - if len(evaluationList) > 0 {  
760 - //360评估的结束时间  
761 - evaluationList[0].BeginTime = param.EndTime  
762 - evaluationList[0].Status = domain.EvaluationCompleted  
763 - err = evaluationRepo.Save(evaluationList[0]) 761 + if len(evaluationFinishList) > 0 {
  762 + if evaluationFinishList[0].BeginTime.After(nowTime) {
  763 + evaluationFinishList[0].BeginTime = nowTime
  764 + }
  765 + evaluationFinishList[0].Status = domain.EvaluationCompleted
  766 + err = evaluationRepo.Save(evaluationFinishList[0])
764 if err != nil { 767 if err != nil {
765 return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error()) 768 return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
766 } 769 }