Merge branch 'test' into dev-zhengzhou

 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
@@ -11,6 +14,7 @@ func RunTaskSmsNotify() {
 	taskSmsNotify.init()
 	taskSmsNotify.init()
 	taskSmsNotify.regist(notifyStaffAssess{})
 	taskSmsNotify.regist(notifyStaffAssess{})
 	taskSmsNotify.regist(notifySummaryEvaluation{})
 	taskSmsNotify.regist(notifySummaryEvaluation{})
+	taskSmsNotify.regist(notifyConfirmEvaluationScore{})
 	taskSmsNotify.runTask()
 	taskSmsNotify.runTask()
 }
 }
 
 
@@ -27,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,17 +36,22 @@ 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 执行短信通知任务
 func (notices *notifySms) runTask() {
 func (notices *notifySms) runTask() {
+	if constant.Env != "prd" {
+		return
+	}
 	timer := time.NewTimer(notices.interval)
 	timer := time.NewTimer(notices.interval)
 	for {
 	for {
 		select {
 		select {
@@ -130,9 +135,7 @@ func (notices *notifySms) checkSendSms() error {
 
 
 // sendSms 发送短信消息
 // sendSms 发送短信消息
 func (notices *notifySms) sendSms(param *domain.LogSms) error {
 func (notices *notifySms) sendSms(param *domain.LogSms) error {
-	if constant.Env != "prd" {
-		return nil
-	}
+
 	//单开处理 数据保存操作,发一条短信更新一条数据
 	//单开处理 数据保存操作,发一条短信更新一条数据
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {

+package notify
+
+import (
+	"time"
+
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
+)
+
+// 短信提醒确认周期评估成绩
+// 条件：上级提交评估后 到10号晚23:59前，对未确认的被评估人每隔6个小时进行提醒（23:00-7:00期间不提醒），直到确认
+type notifyConfirmEvaluationScore struct {
+}
+
+var _ notifySendOrNot = (*notifyConfirmEvaluationScore)(nil)
+
+func (notices notifyConfirmEvaluationScore) from() string {
+	return "ConfirmEvaluationScore"
+}
+
+func (notices notifyConfirmEvaluationScore) makeNotify(param *domain.SummaryEvaluation) *domain.LogSms {
+	newSms := domain.LogSms{
+		Id:         0,
+		Phone:      param.Executor.Account,
+		TemplateId: 5634326,
+		Template:   "您好，#name#，#periodName#成绩已出，请前往绩效系统PC端进行确认哦，超时未确认可能会影响当月绩效工资哦~  ",
+		Value: map[string]string{
+			"name":       param.Executor.UserName,
+			"periodName": param.CycleName,
+		},
+		Result:    "",
+		Status:    domain.SmsWait,
+		From:      notices.from(),
+		Index:     param.Id,
+		ExecuteAt: notices.getTimeExecuteAt(time.Now()),
+		CreatedAt: time.Now(),
+	}
+	return &newSms
+}
+
+// 适配规则：上级提交评估后  到10号晚23:59前，可以发送
+// 适配规则 对未确认的被评估人每隔6个小时进行提醒（23:00-7:00期间不提醒），直到确认
+func (notices notifyConfirmEvaluationScore) ifSend(index int) (bool, error) {
+
+	//检查时间
+	//
+	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,并添加短信数据
+	//计算下一条短信
+	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
+}
+
+// 输入的时间为基础微调短信的执行时间
+// 适配规则 ：（23:00-7:00期间不提醒）
+func (notices notifyConfirmEvaluationScore) getTimeExecuteAt(nowTime time.Time) time.Time {
+	nowHour := nowTime.Local().Hour()
+	if nowHour < 23 && nowHour > 7 {
+		return nowTime
+	}
+	year, month, day := nowTime.Local().Date()
+	//微调执行时间
+	if nowHour >= 23 {
+		//第二天:7:00
+		t1 := time.Date(year, month, day, 23, 59, 59, 0, time.Local)
+		return t1.Add(7 * time.Hour)
+	}
+	if nowHour <= 7 {
+		//当天 7:00
+		t1 := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
+		return t1.Add(7 * time.Hour)
+	}
+	return nowTime
+}

@@ -11,6 +11,8 @@ import (
 type notifyStaffAssess struct {
 type notifyStaffAssess struct {
 }
 }
 
 
+var _ notifySendOrNot = (*notifyStaffAssess)(nil)
+
 func (notices notifyStaffAssess) from() string {
 func (notices notifyStaffAssess) from() string {
 	return "StaffAssess"
 	return "StaffAssess"
 }
 }

@@ -12,6 +12,8 @@ import (
 type notifySummaryEvaluation struct {
 type notifySummaryEvaluation struct {
 }
 }
 
 
+var _ notifySendOrNot = (*notifySummaryEvaluation)(nil)
+
 func (notices notifySummaryEvaluation) from() string {
 func (notices notifySummaryEvaluation) from() string {
 	return "SummaryEvaluation"
 	return "SummaryEvaluation"
 }
 }

@@ -7,6 +7,7 @@ type EvaluationSuperListAdapter struct {
 	EvaluationStatus    string `json:"evaluationStatus"`           //上级评估完成状态
 	EvaluationStatus    string `json:"evaluationStatus"`           //上级评估完成状态
 	EndTime             string `json:"endTime"`                    //截止时间
 	EndTime             string `json:"endTime"`                    //截止时间
 	TotalScoreSelf      string `json:"totalScoreSelf"`             //综合自评总分
 	TotalScoreSelf      string `json:"totalScoreSelf"`             //综合自评总分
+	TotalScoreSuper     string `json:"totalScoreSuper"`            //综合自评总分
 	Department          string `json:"department"`                 //部门
 	Department          string `json:"department"`                 //部门
 	Position            string `json:"position"`                   //职位
 	Position            string `json:"position"`                   //职位
 	EntryTime           string `json:"entryTime"`                  //入职时间
 	EntryTime           string `json:"entryTime"`                  //入职时间

@@ -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,9 +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
 }
 }
 
 
@@ -1572,6 +1579,7 @@ func (srv *SummaryEvaluationService) ListExecutorEvaluationSuper(param *command.
 			Department:          "",
 			Department:          "",
 			Position:            "",
 			Position:            "",
 			EntryTime:           "",
 			EntryTime:           "",
+			TotalScoreSuper:     v.TotalScore,
 		}
 		}
 		for _, dep := range v.TargetDepartment {
 		for _, dep := range v.TargetDepartment {
 			item.Department += dep.DepartmentName + " "
 			item.Department += dep.DepartmentName + " "

@@ -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

@@ -7,7 +7,7 @@ func TestPushInfo(t *testing.T) {
 	c := NewHttplibMmmOpenApiServiceGateway()
 	c := NewHttplibMmmOpenApiServiceGateway()
 	//3436890424617728
 	//3436890424617728
 	//3422173870118400
 	//3422173870118400
-	resp, err := c.PushInfo(0, "mmm.ability.performance", []int64{3436890424617728}, "ceshi推送一个消息233", "消息内容xxxx332")
+	resp, err := c.PushInfo(0, "mmm.ability.performance", []int64{3422173870118400}, "ceshi推送一个消息233", "消息内容xxxx332")
 	if err != nil {
 	if err != nil {
 		t.Error(err)
 		t.Error(err)
 	}
 	}