1. 优化接口输出

@@ -186,7 +186,7 @@ func (srv *SummaryEvaluationService) Evaluation360List(param *command.QueryEvalu
 }
 }
 
 
 // GetEvaluation360 获取360综评详情（我评估目标用户）
 // GetEvaluation360 获取360综评详情（我评估目标用户）
-func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvaluation360My) (*adapter.EvaluationInfoAdapter, error) {
+func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvaluation360My) (*[]adapter.EvaluationItemAdapter, error) {
 	transactionContext, err := factory.ValidateStartTransaction(param)
 	transactionContext, err := factory.ValidateStartTransaction(param)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
@@ -229,21 +229,24 @@ func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvalua
 	}
 	}
 
 
 	itemValuesAdapter := srv.buildSummaryItemValue(itemList, itemValues)
 	itemValuesAdapter := srv.buildSummaryItemValue(itemList, itemValues)
-	result := adapter.EvaluationInfoAdapter{
-		SummaryEvaluationId:   sEvaluation.Id,
-		CycleId:               int(sEvaluation.CycleId),
-		CycleName:             sEvaluation.CycleName,
-		EvaluationProjectId:   sEvaluation.EvaluationProjectId,
-		EvaluationProjectName: sEvaluation.EvaluationProjectName,
-		LinkNodeId:            sEvaluation.NodeId,
-		BeginTime:             sEvaluation.BeginTime.Format("2006-01-02 15:04:05"),
-		EndTime:               sEvaluation.EndTime.Format("2006-01-02 15:04:05"),
-		TargetUserId:          sEvaluation.TargetUser.UserId,
-		TargetUserName:        sEvaluation.TargetUser.UserName,
-		Status:                string(sEvaluation.Status),
-		EvaluationItems:       itemValuesAdapter,
-	}
-	return &result, nil
+	for i := range itemValuesAdapter { // 评估人名称赋值
+		itemValuesAdapter[i].EvaluatorName = sEvaluation.Executor.UserName
+	}
+	//result := adapter.EvaluationInfoAdapter{
+	//	SummaryEvaluationId:   sEvaluation.Id,
+	//	CycleId:               int(sEvaluation.CycleId),
+	//	CycleName:             sEvaluation.CycleName,
+	//	EvaluationProjectId:   sEvaluation.EvaluationProjectId,
+	//	EvaluationProjectName: sEvaluation.EvaluationProjectName,
+	//	LinkNodeId:            sEvaluation.NodeId,
+	//	BeginTime:             sEvaluation.BeginTime.Format("2006-01-02 15:04:05"),
+	//	EndTime:               sEvaluation.EndTime.Format("2006-01-02 15:04:05"),
+	//	TargetUserId:          sEvaluation.TargetUser.UserId,
+	//	TargetUserName:        sEvaluation.TargetUser.UserName,
+	//	Status:                string(sEvaluation.Status),
+	//	EvaluationItems:       itemValuesAdapter,
+	//}
+	return &itemValuesAdapter, nil
 }
 }
 
 
 // GetEvaluation360All 获取360综评详情-上级综评（所有的评估人，评估内容）
 // GetEvaluation360All 获取360综评详情-上级综评（所有的评估人，评估内容）
@@ -645,6 +648,12 @@ func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvalu
 	}
 	}
 
 
 	itemValuesAdapter := srv.buildSummaryItemValue(itemList, itemValues)
 	itemValuesAdapter := srv.buildSummaryItemValue(itemList, itemValues)
+	for i := range itemValuesAdapter { // 评估人名称赋值
+		if executor, ok := executorMap[itemValuesAdapter[i].EvaluatorId]; ok {
+			itemValuesAdapter[i].EvaluatorName = executor.UserName
+		}
+	}
+
 	//result := adapter.EvaluationInfoAdapter{
 	//result := adapter.EvaluationInfoAdapter{
 	//	SummaryEvaluationId:   sEvaluation.Id,
 	//	SummaryEvaluationId:   sEvaluation.Id,
 	//	CycleId:               int(sEvaluation.CycleId),
 	//	CycleId:               int(sEvaluation.CycleId),