暂存

@@ -107,7 +107,9 @@ func (srv *SummaryEvaluationService) buildSummaryFinishValue(transactionContext
 	}
 	}
 
 
 	_, itemUsed, err := evaluationItemRepo.Find(map[string]interface{}{"evaluationProjectId": evaluationFinisih.EvaluationProjectId, "nodeType": domain.LinkNodeSelfAssessment})
 	_, itemUsed, err := evaluationItemRepo.Find(map[string]interface{}{"evaluationProjectId": evaluationFinisih.EvaluationProjectId, "nodeType": domain.LinkNodeSelfAssessment})
-
+	if err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
 	var evaluationFinishValue []*domain.SummaryEvaluationValue
 	var evaluationFinishValue []*domain.SummaryEvaluationValue
 	var evaluationData *domain.SummaryEvaluation
 	var evaluationData *domain.SummaryEvaluation
 	//尝试获取目标人员的上级评估
 	//尝试获取目标人员的上级评估
@@ -142,5 +144,25 @@ func (srv *SummaryEvaluationService) buildSummaryFinishValue(transactionContext
 		return evaluationFinishValue, nil
 		return evaluationFinishValue, nil
 	}
 	}
 
 
-	return nil, nil
+	//使用360评估、人资评估、构建考核结果的评估项内容
+	var itemValueBack []*domain.SummaryEvaluationValue
+	var summaryEvaluationId []int
+	for _, val := range evaluationList {
+		if val.Types == domain.Evaluation360 || val.Types == domain.EvaluationHrbp || val.Types == domain.EvaluationSelf {
+			summaryEvaluationId = append(summaryEvaluationId, val.Id)
+		}
+	}
+	if len(summaryEvaluationId) > 0 {
+		_, itemValueBack, err = evaluationValueRepo.Find(map[string]interface{}{"summaryEvaluationIdList": summaryEvaluationId})
+		if err != nil {
+			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+		}
+	}
+	_ = itemValueBack
+	//使用
+	// for _, val := range itemValueBack {
+
+	// }
+
+	return evaluationFinishValue, nil
 }
 }

@@ -8,6 +8,8 @@ import (
 
 
 func TestToken(t *testing.T) {
 func TestToken(t *testing.T) {
 	c := NewClient()
 	c := NewClient()
+	c.AppKey = "7q9Kd8ktoB"
+	c.AppSecret = "pQSoBj44Wk"
 	h := c.useHeader()
 	h := c.useHeader()
 	t.Logf("%v", h)
 	t.Logf("%v", h)
 }
 }