作者 tangxvhui

暂存

@@ -104,7 +104,7 @@ func (srv *SummaryEvaluationService) buildSummaryFinishValue(transactionContext @@ -104,7 +104,7 @@ func (srv *SummaryEvaluationService) buildSummaryFinishValue(transactionContext
104 []*domain.SummaryEvaluationValue, error) { 104 []*domain.SummaryEvaluationValue, error) {
105 evaluationRepo := factory.CreateSummaryEvaluationRepository(map[string]interface{}{"transactionContext": transactionContext}) 105 evaluationRepo := factory.CreateSummaryEvaluationRepository(map[string]interface{}{"transactionContext": transactionContext})
106 evaluationValueRepo := factory.CreateSummaryEvaluationValueRepository(map[string]interface{}{"transactionContext": transactionContext}) 106 evaluationValueRepo := factory.CreateSummaryEvaluationValueRepository(map[string]interface{}{"transactionContext": transactionContext})
107 - 107 + evaluationItemRepo := factory.CreateEvaluationItemUsedRepository(map[string]interface{}{"transactionContext": transactionContext})
108 //尝试获取目标人员的所有评估 108 //尝试获取目标人员的所有评估
109 _, evaluationList, err := evaluationRepo.Find(map[string]interface{}{ 109 _, evaluationList, err := evaluationRepo.Find(map[string]interface{}{
110 "targetUserId": evaluationFinisih.TargetUser.UserId, 110 "targetUserId": evaluationFinisih.TargetUser.UserId,
@@ -113,12 +113,16 @@ func (srv *SummaryEvaluationService) buildSummaryFinishValue(transactionContext @@ -113,12 +113,16 @@ func (srv *SummaryEvaluationService) buildSummaryFinishValue(transactionContext
113 if err != nil { 113 if err != nil {
114 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 114 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
115 } 115 }
  116 +
  117 + _, itemUsed, err := evaluationItemRepo.Find(map[string]interface{}{"evaluationProjectId": evaluationFinisih.EvaluationProjectId, "nodeType": domain.LinkNodeSelfAssessment})
  118 +
116 var evaluationFinishValue []*domain.SummaryEvaluationValue 119 var evaluationFinishValue []*domain.SummaryEvaluationValue
117 var evaluationData *domain.SummaryEvaluation 120 var evaluationData *domain.SummaryEvaluation
118 //尝试获取目标人员的上级评估 121 //尝试获取目标人员的上级评估
119 for _, val := range evaluationList { 122 for _, val := range evaluationList {
120 evaluationData = val 123 evaluationData = val
121 } 124 }
  125 +
122 if evaluationData != nil { 126 if evaluationData != nil {
123 127
124 return evaluationFinishValue, nil 128 return evaluationFinishValue, nil