提交新的

@@ -73,8 +73,12 @@ func sendSummaryEvaluation(project *domain.EvaluationProject,
 	}
 	}
 	nodeId := 0
 	nodeId := 0
 	executor360Map := map[int64]*domain.User{}
 	executor360Map := map[int64]*domain.User{}
+	hrbpExist := false
 	for _, v := range itemList {
 	for _, v := range itemList {
 		nodeId = v.NodeId
 		nodeId = v.NodeId
+		if v.EvaluatorId < 0 {
+			hrbpExist = true
+		}
 		if v.EvaluatorId <= 0 {
 		if v.EvaluatorId <= 0 {
 			continue
 			continue
 		}
 		}
@@ -106,8 +110,8 @@ func sendSummaryEvaluation(project *domain.EvaluationProject,
 		DeletedAt:             nil,
 		DeletedAt:             nil,
 	}
 	}
 
 
-	//确定自评
-	//确定 被评估人的 上级评估
+	//确定周期评估
+
 	for _, v := range targetUserMap {
 	for _, v := range targetUserMap {
 		//处理自评
 		//处理自评
 		evaluationTemp.TargetUser = domain.StaffDesc{
 		evaluationTemp.TargetUser = domain.StaffDesc{
@@ -136,13 +140,15 @@ func sendSummaryEvaluation(project *domain.EvaluationProject,
 		}
 		}
 		//确定自评
 		//确定自评
 		newEvaluationList = append(newEvaluationList, evaluationTemp)
 		newEvaluationList = append(newEvaluationList, evaluationTemp)
-		//处理人资评估
-		evaluationTemp.BeginTime = beginTime360
-		evaluationTemp.EndTime = endTime360
-		evaluationTemp.Executor = domain.StaffDesc{}
-		evaluationTemp.Types = domain.EvaluationHrbp
-		//确定人资评估
-		newEvaluationList = append(newEvaluationList, evaluationTemp)
+		if hrbpExist {
+			//处理人资评估
+			evaluationTemp.BeginTime = beginTime360
+			evaluationTemp.EndTime = endTime360
+			evaluationTemp.Executor = domain.StaffDesc{}
+			evaluationTemp.Types = domain.EvaluationHrbp
+			//确定人资评估
+			newEvaluationList = append(newEvaluationList, evaluationTemp)
+		}
 		//处理360 评估
 		//处理360 评估
 		for _, v2 := range executor360Map {
 		for _, v2 := range executor360Map {
 			evaluationTemp.BeginTime = beginTime360
 			evaluationTemp.BeginTime = beginTime360

@@ -39,11 +39,11 @@ type RatingCodeNumber struct {
 type EvaluationType int //综合评估类型
 type EvaluationType int //综合评估类型
 
 
 const (
 const (
-	EvaluationSelf  EvaluationType = 1 //自评
-	Evaluation360   EvaluationType = 2 //360评估
-	EvaluationSuper EvaluationType = 3 //上级评估
-	EvaluationHrbp  EvaluationType = 4 //人资评估
-
+	EvaluationSelf   EvaluationType = 1 //自评
+	Evaluation360    EvaluationType = 2 //360评估
+	EvaluationSuper  EvaluationType = 3 //上级评估
+	EvaluationHrbp   EvaluationType = 4 //人资评估
+	EvaluationFinish EvaluationType = 5 //考核结果
 )
 )
 
 
 // 评估的填写状态
 // 评估的填写状态