更新

 package notify
 package notify
 
 
-import "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
+import (
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
+)
 
 
 // 执行定时任务检查是否发送短信通知
 // 执行定时任务检查是否发送短信通知
 var taskSmsNotify *notifySms
 var taskSmsNotify *notifySms
@@ -28,3 +31,33 @@ func AddNotifySummaryEvaluation(param *domain.SummaryEvaluation) {
 	newSms := newNotify.makeNotify(param)
 	newSms := newNotify.makeNotify(param)
 	taskSmsNotify.addTask(newSms)
 	taskSmsNotify.addTask(newSms)
 }
 }
+
+// 确认周期评估短信提醒 ,预创建待发送的短信消息
+func AddNotifyConfirmEvaluationScore(param *domain.SummaryEvaluation) error {
+	newNotify := notifyConfirmEvaluationScore{}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return err
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return err
+	}
+	defer func() {
+		_ = transactionContext.RollbackTransaction()
+	}()
+	logSmsRepo := factory.CreateLogSmsRepository(map[string]interface{}{"transactionContext": transactionContext})
+
+	cnt, _, err := logSmsRepo.Find(map[string]interface{}{"from": newNotify.from(), "index": param.Id, "limit": 1})
+	if err != nil {
+		return err
+	}
+	if cnt > 0 {
+		return nil
+	}
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return err
+	}
+
+	newSms := newNotify.makeNotify(param)
+	return taskSmsNotify.addTask(newSms)
+}

@@ -36,13 +36,15 @@ func (notices *notifySms) regist(ifsend notifySendOrNot) {
 	notices.sendOrNot[ifsend.from()] = ifsend
 	notices.sendOrNot[ifsend.from()] = ifsend
 }
 }
 
 
-func (notices *notifySms) addTask(task *domain.LogSms) {
+func (notices *notifySms) addTask(task *domain.LogSms) error {
 	// notices.newSms <- task
 	// notices.newSms <- task
 	err := notices.addNewSms(task)
 	err := notices.addNewSms(task)
 	if err != nil {
 	if err != nil {
 		e := fmt.Sprintf("添加短信通知任务:%+v %s", task, err)
 		e := fmt.Sprintf("添加短信通知任务:%+v %s", task, err)
 		log.Logger.Error(e)
 		log.Logger.Error(e)
+		return fmt.Errorf("添加短信通知任务:%s", err)
 	}
 	}
+	return nil
 }
 }
 
 
 // RunTask 执行短信通知任务
 // RunTask 执行短信通知任务

@@ -3,6 +3,7 @@ package notify
 import (
 import (
 	"time"
 	"time"
 
 
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 )
 )
 
 
@@ -21,8 +22,8 @@ func (notices notifyConfirmEvaluationScore) makeNotify(param *domain.SummaryEval
 	newSms := domain.LogSms{
 	newSms := domain.LogSms{
 		Id:         0,
 		Id:         0,
 		Phone:      param.Executor.Account,
 		Phone:      param.Executor.Account,
-		TemplateId: 5475050,
-		Template:   "您好，#name#，#periodName#成绩已出，请前往绩效系统PC端进行确认哦，逾期未确认可能会影响当月绩效工资哦~  ",
+		TemplateId: 5634326,
+		Template:   "您好，#name#，#periodName#成绩已出，请前往绩效系统PC端进行确认哦，超时未确认可能会影响当月绩效工资哦~  ",
 		Value: map[string]string{
 		Value: map[string]string{
 			"name":       param.Executor.UserName,
 			"name":       param.Executor.UserName,
 			"periodName": param.CycleName,
 			"periodName": param.CycleName,
@@ -37,12 +38,53 @@ func (notices notifyConfirmEvaluationScore) makeNotify(param *domain.SummaryEval
 	return &newSms
 	return &newSms
 }
 }
 
 
+// 适配规则：上级提交评估后  到10号晚23:59前，可以发送
+// 适配规则 对未确认的被评估人每隔6个小时进行提醒（23:00-7:00期间不提醒），直到确认
 func (notices notifyConfirmEvaluationScore) ifSend(index int) (bool, error) {
 func (notices notifyConfirmEvaluationScore) ifSend(index int) (bool, error) {
+
 	//检查时间
 	//检查时间
-	//适配规则：上级提交评估后  到10号晚23:59前，可以发送
+	//
+	nowTime := time.Now()
+	if nowTime.Day() > 10 {
+		return false, nil
+	}
+
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return false, err
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return false, err
+	}
+	defer func() {
+		_ = transactionContext.RollbackTransaction()
+	}()
+	summaryEvaluationRepo := factory.CreateSummaryEvaluationRepository(map[string]interface{}{"transactionContext": transactionContext})
+	summaryEvaluationData, err := summaryEvaluationRepo.FindOne(map[string]interface{}{"id": index})
+	if err != nil {
+		return false, err
+	}
+	if summaryEvaluationData.Types == domain.EvaluationFinish {
+		return false, nil
+	}
+	//已确认 成绩，不在发送成绩
+	if summaryEvaluationData.CheckResult == domain.EvaluationCheckCompleted {
+		return false, nil
+	}
 
 
 	//检查数据 SummaryEvaluation ,types=5,并添加短信数据
 	//检查数据 SummaryEvaluation ,types=5,并添加短信数据
-	//适配规则 对未确认的被评估人每隔6个小时进行提醒（23:00-7:00期间不提醒），直到确认
+	//计算下一条短信
+	smsMessage := notices.makeNotify(summaryEvaluationData)
+	nextTime := nowTime.Add(6 * time.Hour)
+	smsMessage.ExecuteAt = notices.getTimeExecuteAt(nextTime)
+	logSmsRepo := factory.CreateLogSmsRepository(map[string]interface{}{"transactionContext": transactionContext})
+	err = logSmsRepo.Save(smsMessage)
+	if err != nil {
+		return true, err
+	}
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return false, err
+	}
 
 
 	return true, nil
 	return true, nil
 }
 }

@@ -10,6 +10,7 @@ import (
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/utils/tool_funs"
 	"github.com/linmadan/egglib-go/utils/tool_funs"
 	"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/application/notify"
 	roleService "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role"
 	roleService "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/summary_evaluation/adapter"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/summary_evaluation/adapter"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/summary_evaluation/command"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/summary_evaluation/command"
@@ -821,10 +822,15 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
 		}
 		}
 	}
 	}
-	//添加确认绩效成绩提醒短信提醒
+
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
+	//添加确认绩效成绩提醒短信提醒
+	err = notify.AddNotifyConfirmEvaluationScore(param)
+	if err != nil {
+		return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error())
+	}
 	return nil
 	return nil
 }
 }
 
 

@@ -68,7 +68,12 @@ func (repo *LogSmsRepository) Find(queryOptions map[string]interface{}) (int, []
 	if v, ok := queryOptions["executeAtEnd"]; ok {
 	if v, ok := queryOptions["executeAtEnd"]; ok {
 		query.Where("execute_at<=?", v)
 		query.Where("execute_at<=?", v)
 	}
 	}
-
+	if v, ok := queryOptions["from"]; ok {
+		query.Where("from=?", v)
+	}
+	if v, ok := queryOptions["index"]; ok {
+		query.Where("index=?", v)
+	}
 	count, err := query.SelectAndCount()
 	count, err := query.SelectAndCount()
 	if err != nil {
 	if err != nil {
 		return 0, nil, err
 		return 0, nil, err