Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/performance into test

@@ -198,13 +198,14 @@ func (rs *EvaluationProjectService) UpdateTemplate(in *command.UpdateProjectTemp
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
 
 
-	minTime := cycle.TimeStart
-	maxTime := cycle.TimeEnd
-	if start.Before(*minTime) {
+	minTime := time.Date(cycle.TimeStart.Year(), cycle.TimeStart.Month(), cycle.TimeStart.Day(), cycle.TimeStart.Hour(), cycle.TimeStart.Minute(), 0, 0, time.Local)
+	maxTime := time.Date(cycle.TimeEnd.Year(), cycle.TimeEnd.Month(), cycle.TimeEnd.Day(), cycle.TimeEnd.Hour(), cycle.TimeEnd.Minute(), 0, 0, time.Local)
+
+	if start.Before(minTime) {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, "评估起始时间不能超出周期起始时间")
 		return nil, application.ThrowError(application.BUSINESS_ERROR, "评估起始时间不能超出周期起始时间")
 	}
 	}
 
 
-	if end.After(*maxTime) {
+	if end.After(maxTime) {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, "评估截至时间不能超出周期截至时间")
 		return nil, application.ThrowError(application.BUSINESS_ERROR, "评估截至时间不能超出周期截至时间")
 	}
 	}
 
 

@@ -3,6 +3,7 @@ package service
 import (
 import (
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/utils"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/utils"
 	"time"
 	"time"
 )
 )
@@ -25,6 +26,8 @@ func (rs *NodeTaskService) SendEvaluationNode() error {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
 	taskRepository := factory.CreateNodeTaskRepository(map[string]interface{}{"transactionContext": transactionContext})
 	taskRepository := factory.CreateNodeTaskRepository(map[string]interface{}{"transactionContext": transactionContext})
+	projectRepository := factory.CreateEvaluationProjectRepository(map[string]interface{}{"transactionContext": transactionContext})
+	//cycleRepository := factory.CreateEvaluationCycleRepository(map[string]interface{}{"transactionContext": transactionContext})
 
 
 	tasks, err := taskRepository.Find(map[string]interface{}{"now": time.Now().Local()})
 	tasks, err := taskRepository.Find(map[string]interface{}{"now": time.Now().Local()})
 	if err != nil {
 	if err != nil {
@@ -33,17 +36,53 @@ func (rs *NodeTaskService) SendEvaluationNode() error {
 
 
 	//ttaffAssessRepository := factory.CreateStaffAssessTaskRepository(map[string]interface{}{"transactionContext": transactionContext})
 	//ttaffAssessRepository := factory.CreateStaffAssessTaskRepository(map[string]interface{}{"transactionContext": transactionContext})
 	//
 	//
-	//for i := range tasks {
-	//
-	//	staffAssessService := service.NewStaffAssessServeice()
-	//	//staffAssessService.CreateStaffAssessTask()
-	//
-	//	//task := tasks[i]
-	//
+
+	projectIdsMap := map[int64]*domain.EvaluationProject{}
+	cycleIdsMap := map[int64]*domain.EvaluationCycle{}
+	for i := range tasks {
+		task := tasks[i]
+		projectIdsMap[task.ProjectId] = nil
+		cycleIdsMap[task.CycleId] = nil
+	}
+	projectIds := make([]int64, 0)
+	cycleIds := make([]int64, 0)
+	for k := range projectIdsMap {
+		projectIds = append(projectIds, k)
+	}
+	for k := range cycleIdsMap {
+		cycleIds = append(cycleIds, k)
+	}
+
+	_, projects, err := projectRepository.Find(map[string]interface{}{"ids": projectIds})
+	if err != nil {
+		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	//_, cycles, err := cycleRepository.Find(map[string]interface{}{"ids": cycleIds})
+	//if err != nil {
+	//	return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	//}
 	//}
 
 
+	for i := range projects {
+		projectIdsMap[projects[i].Id] = projects[i]
+	}
+
+	//staffAssessService := service.NewStaffAssessServeice()
+
 	for i := range tasks {
 	for i := range tasks {
 		task := tasks[i]
 		task := tasks[i]
+
+		//if project, ok := projectIdsMap[task.ProjectId]; ok {
+
+		//csat := &command.CreateStaffAssessTask{
+		//	CompanyId:             project.CompanyId,
+		//	EvaluationProjectId:   project.Id,
+		//	EvaluationProjectName: project.Name,
+		//	CycleId:               project.CycleId,
+		//}
+		//
+		//staffAssessService.CreateStaffAssessTask(csat)
+		//}
+
 		// 下一次发送时间
 		// 下一次发送时间
 		nextTime := utils.NextTimeInc(task.NextSentAt, task.KpiCycle)
 		nextTime := utils.NextTimeInc(task.NextSentAt, task.KpiCycle)
 		task.NextSentAt = &nextTime
 		task.NextSentAt = &nextTime