更新 对 评估考核结果的处理

@@ -56,7 +56,7 @@ func (srv *SummaryEvaluationService) ExportAllEvaluationSuper(param *command.Que
 	//获取评估列表信息
 	//获取评估列表信息
 	condition1 := map[string]interface{}{
 	condition1 := map[string]interface{}{
 		"cycleId": param.CycleId,
 		"cycleId": param.CycleId,
-		"types":   int(domain.EvaluationSuper),
+		"types":   int(domain.EvaluationFinish),
 		"limit":   limit,
 		"limit":   limit,
 	}
 	}
 	if offset > 0 {
 	if offset > 0 {

@@ -177,6 +177,12 @@ func sendSummaryEvaluation(project *domain.EvaluationProject,
 			//确定上级评估
 			//确定上级评估
 			newEvaluationList = append(newEvaluationList, evaluationTemp)
 			newEvaluationList = append(newEvaluationList, evaluationTemp)
 		}
 		}
+		// 确定 考核结果 的评估记录
+		evaluationTemp.Types = domain.EvaluationFinish
+		evaluationTemp.Executor = domain.StaffDesc{}
+		evaluationTemp.BeginTime = endTimeSuper
+		evaluationTemp.EndTime = endTimeSuper.Add(2 * 24 * time.Hour)
+		newEvaluationList = append(newEvaluationList, evaluationTemp)
 	}
 	}
 	summaryEvaluationRepo := factory.CreateSummaryEvaluationRepository(map[string]interface{}{"transactionContext": transactionContext})
 	summaryEvaluationRepo := factory.CreateSummaryEvaluationRepository(map[string]interface{}{"transactionContext": transactionContext})
 	for i := range newEvaluationList {
 	for i := range newEvaluationList {

@@ -200,11 +200,12 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
 	}
 	}
 
 
 	//查找当前周期，我的考核结果
 	//查找当前周期，我的考核结果
-	_, myEvaluationSuper, _ := evaluationRepo.Find(map[string]interface{}{
-		"types":        int(domain.EvaluationSuper),
+	_, myEvaluationFinish, _ := evaluationRepo.Find(map[string]interface{}{
+		"types":        int(domain.EvaluationFinish),
 		"limit":        1,
 		"limit":        1,
 		"targetUserId": param.UserId,
 		"targetUserId": param.UserId,
 		"cycleId":      param.CycleId,
 		"cycleId":      param.CycleId,
+		"beginTime":    time.Now(),
 	})
 	})
 
 
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
@@ -243,15 +244,13 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
 		}
 		}
 		menu1.Child = append(menu1.Child, menu1_1)
 		menu1.Child = append(menu1.Child, menu1_1)
 	}
 	}
-	if len(myEvaluationSuper) > 0 {
-		if myEvaluationSuper[0].CheckResult == domain.EvaluationCheckCompleted {
+	if len(myEvaluationFinish) > 0 {
+		if myEvaluationFinish[0].CheckResult == domain.EvaluationCheckCompleted {
 			menu1_2.StatusName = "已完成"
 			menu1_2.StatusName = "已完成"
 		} else {
 		} else {
 			menu1_2.StatusName = "未完成"
 			menu1_2.StatusName = "未完成"
 		}
 		}
-		if myEvaluationSuper[0].Status == domain.EvaluationCompleted {
-			menu1.Child = append(menu1.Child, menu1_2)
-		}
+		menu1.Child = append(menu1.Child, menu1_2)
 	}
 	}
 
 
 	if len(selfEvaluation) > 0 {
 	if len(selfEvaluation) > 0 {
@@ -670,18 +669,14 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain.
 		if err != nil {
 		if err != nil {
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		}
 		}
-		if len(evaluationList) == 0 {
-			// 获取考核结果阶段
-			finishEvaluation := *param
-			finishEvaluation.BeginTime = time.Now()
-			finishEvaluation.CreatedAt = time.Now()
-			finishEvaluation.UpdatedAt = time.Now()
-			finishEvaluation.Executor = domain.StaffDesc{}
-			finishEvaluation.Id = 0
-			finishEvaluation.Types = domain.EvaluationFinish
-			err = evaluationRepo.Save(&finishEvaluation)
-			if err != nil {
-				return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
+		if len(evaluationList) > 0 {
+			// 进入考核结果阶段
+			if evaluationList[0].BeginTime.After(nowTime) {
+				evaluationList[0].BeginTime = nowTime
+				err = evaluationRepo.Save(evaluationList[0])
+				if err != nil {
+					return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
+				}
 			}
 			}
 		}
 		}
 	}
 	}
@@ -773,19 +768,13 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma
 		if err != nil {
 		if err != nil {
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		}
 		}
-		if len(evaluationList) == 0 {
-			finishEvaluation := *param
-			finishEvaluation.BeginTime = time.Now()
-			finishEvaluation.CreatedAt = time.Now()
-			finishEvaluation.UpdatedAt = time.Now()
-			finishEvaluation.Executor = domain.StaffDesc{}
-			finishEvaluation.Id = 0
-			finishEvaluation.Types = domain.EvaluationFinish
-			finishEvaluation.TotalScore = ""
-			finishEvaluation.TotalRating = []domain.RatingCodeNumber{}
-			err = evaluationRepo.Save(&finishEvaluation)
-			if err != nil {
-				return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
+		if len(evaluationList) > 0 {
+			if evaluationList[0].BeginTime.After(nowTime) {
+				evaluationList[0].BeginTime = nowTime
+				err = evaluationRepo.Save(evaluationList[0])
+				if err != nil {
+					return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
+				}
 			}
 			}
 		}
 		}
 	}
 	}
@@ -795,7 +784,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma
 	return nil
 	return nil
 }
 }
 
 
-// 员工提交上级评估
+// 员工提交上级评估后
 // 生成考核结果
 // 生成考核结果
 func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain.SummaryEvaluation) error {
 func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain.SummaryEvaluation) error {
 	lock := xredis.NewLockSummaryEvaluation(param.TargetUser.UserId)
 	lock := xredis.NewLockSummaryEvaluation(param.TargetUser.UserId)
@@ -831,19 +820,14 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain
 	if err != nil {
 	if err != nil {
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
-	if len(evaluationList) == 0 {
-		finishEvaluation := *param
-		finishEvaluation.BeginTime = time.Now()
-		finishEvaluation.CreatedAt = time.Now()
-		finishEvaluation.UpdatedAt = time.Now()
-		finishEvaluation.Executor = domain.StaffDesc{}
-		finishEvaluation.Id = 0
-		finishEvaluation.Types = domain.EvaluationFinish
-		finishEvaluation.TotalScore = ""
-		finishEvaluation.TotalRating = []domain.RatingCodeNumber{}
-		err = evaluationRepo.Save(&finishEvaluation)
-		if err != nil {
-			return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
+	nowTime := time.Now()
+	if len(evaluationList) > 0 {
+		if evaluationList[0].BeginTime.After(nowTime) {
+			evaluationList[0].BeginTime = nowTime
+			err = evaluationRepo.Save(evaluationList[0])
+			if err != nil {
+				return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
+			}
 		}
 		}
 	}
 	}
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
@@ -1609,8 +1593,12 @@ func (srv *SummaryEvaluationService) GetTargetUserEvaluationSuper(param *command
 	return &result, nil
 	return &result, nil
 }
 }
 
 
-// 获取周期综合评估下，周期评估列表
 func (srv *SummaryEvaluationService) ListAllEvaluationSuper(param *command.QueryEvaluationList) (map[string]interface{}, error) {
 func (srv *SummaryEvaluationService) ListAllEvaluationSuper(param *command.QueryEvaluationList) (map[string]interface{}, error) {
+	return nil, nil
+}
+
+// 按周期获取所有员工的评估考核结果
+func (srv *SummaryEvaluationService) ListAllEvaluationFinish(param *command.QueryEvaluationList) (map[string]interface{}, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -1654,7 +1642,7 @@ func (srv *SummaryEvaluationService) ListAllEvaluationSuper(param *command.Query
 	//获取评估列表信息
 	//获取评估列表信息
 	condition1 := map[string]interface{}{
 	condition1 := map[string]interface{}{
 		"cycleId":   param.CycleId,
 		"cycleId":   param.CycleId,
-		"types":     int(domain.EvaluationSuper),
+		"types":     int(domain.EvaluationFinish),
 		"limit":     limit,
 		"limit":     limit,
 		"beginTime": time.Now(),
 		"beginTime": time.Now(),
 	}
 	}
@@ -1755,12 +1743,14 @@ func (srv *SummaryEvaluationService) editEvaluationValue(
 	}
 	}
 	evaluationItemMap := map[int]*domain.EvaluationItemUsed{}
 	evaluationItemMap := map[int]*domain.EvaluationItemUsed{}
 	evaluationValueMap := map[int]*domain.SummaryEvaluationValue{}
 	evaluationValueMap := map[int]*domain.SummaryEvaluationValue{}
+	evaluationValueSlice := []*domain.SummaryEvaluationValue{}
 	evaluationData.TotalRating = nil //清空评级数量统计
 	evaluationData.TotalRating = nil //清空评级数量统计
 	for _, v := range evaluationItems {
 	for _, v := range evaluationItems {
 		newValue := &domain.SummaryEvaluationValue{}
 		newValue := &domain.SummaryEvaluationValue{}
 		newValue.SetBlankValue(evaluationData, v)
 		newValue.SetBlankValue(evaluationData, v)
 		evaluationValueMap[v.Id] = newValue
 		evaluationValueMap[v.Id] = newValue
 		evaluationItemMap[v.Id] = v
 		evaluationItemMap[v.Id] = v
+		evaluationValueSlice = append(evaluationValueSlice, newValue)
 		//重置计数
 		//重置计数
 		evaluationData.ResetTotalRating(v)
 		evaluationData.ResetTotalRating(v)
 	}
 	}
@@ -1818,10 +1808,14 @@ func (srv *SummaryEvaluationService) editEvaluationValue(
 		}
 		}
 	}
 	}
 	//完全更新itemValueList
 	//完全更新itemValueList
-	*itemValueList = (*itemValueList)[0:0]
-	for _, v := range evaluationValueMap {
-		*itemValueList = append(*itemValueList, v)
-	}
+	*itemValueList = evaluationValueSlice
+	// *itemValueList = (*itemValueList)[0:0]
+	// for _, v := range evaluationValueMap {
+	// 	*itemValueList = append(*itemValueList, v)
+	// }
+	// sort.Slice(*itemValueList, func(i, j int) bool {
+	// 	return (*itemValueList)[i].EvaluationItemId < (*itemValueList)[j].EvaluationItemId
+	// })
 	// 计算总得分
 	// 计算总得分
 	err := evaluationData.EvaluationTotalScore(*itemValueList)
 	err := evaluationData.EvaluationTotalScore(*itemValueList)
 	if err != nil {
 	if err != nil {

@@ -120,7 +120,7 @@ func (repo *SummaryEvaluationValueRepository) Find(queryOptions map[string]inter
 	if v, ok := queryOptions["types"]; ok {
 	if v, ok := queryOptions["types"]; ok {
 		query.Where("types=?", v)
 		query.Where("types=?", v)
 	}
 	}
-
+	query.Order("evaluation_item_id")
 	count, err := query.SelectAndCount()
 	count, err := query.SelectAndCount()
 	if err != nil {
 	if err != nil {
 		return 0, nil, err
 		return 0, nil, err