添加 上级评估列表 字段输出

+package notify
+
+// 短信通知
+
+// 周期评估短信通知
+// 条件：周期自评结束前4个小时，且还未完成评估填写
+type NotifySummaryEvaluation struct{}
+
+// 每日自评短信通知
+// 条件：每日自评结束前30分钟，且还未完成评估填写
+type NotifyStaffAssess struct{}

@@ -3,6 +3,7 @@ package adapter
 type EvaluationSuperListAdapter struct {
 type EvaluationSuperListAdapter struct {
 	SummaryEvaluationId int    `json:"summaryEvaluationId,string"` //评估任务id
 	SummaryEvaluationId int    `json:"summaryEvaluationId,string"` //评估任务id
 	TargetUserName      string `json:"targetUserName"`             //目标用户，被评估的员工
 	TargetUserName      string `json:"targetUserName"`             //目标用户，被评估的员工
+	TargetUserId        int    `json:"targetUserId,string"`        //目标用户，被评估的员工
 	EvaluationStatus    string `json:"evaluationStatus"`           //上级评估完成状态
 	EvaluationStatus    string `json:"evaluationStatus"`           //上级评估完成状态
 	EndTime             string `json:"endTime"`                    //截止时间
 	EndTime             string `json:"endTime"`                    //截止时间
 	TotalScoreSelf      string `json:"totalScoreSelf"`             //综合自评总分
 	TotalScoreSelf      string `json:"totalScoreSelf"`             //综合自评总分

@@ -273,7 +273,7 @@ func TaskSendSummaryEvaluation() error {
 		return err
 		return err
 	}
 	}
 	//发送短信通知
 	//发送短信通知
-	err = sendSmsEvalation(createdEvalationList)
+	//err = sendSmsEvalation(createdEvalationList)
 	return err
 	return err
 }
 }
 
 
@@ -330,3 +330,4 @@ func sendSmsEvalation(param []domain.SummaryEvaluation) error {
 }
 }
 
 
 //周期自评 短信提醒
 //周期自评 短信提醒
+//周期自评 结束前 4个小时发送

@@ -1019,6 +1019,7 @@ func (srv *SummaryEvaluationService) ListExecutorEvaluationSuper(param *command.
 		item := adapter.EvaluationSuperListAdapter{
 		item := adapter.EvaluationSuperListAdapter{
 			SummaryEvaluationId: v.Id,
 			SummaryEvaluationId: v.Id,
 			TargetUserName:      v.TargetUser.UserName,
 			TargetUserName:      v.TargetUser.UserName,
+			TargetUserId:        v.TargetUser.UserId,
 			EvaluationStatus:    string(v.Status),
 			EvaluationStatus:    string(v.Status),
 			EndTime:             v.EndTime.Format("2006-01-02 15:04:05"),
 			EndTime:             v.EndTime.Format("2006-01-02 15:04:05"),
 			TotalScoreSelf:      "",
 			TotalScoreSelf:      "",

@@ -11,9 +11,20 @@ type LogSms struct {
 	Template   string
 	Template   string
 	Value      map[string]string
 	Value      map[string]string
 	Result     string
 	Result     string
+	Status     SmsStatus
 	CreatedAt  time.Time
 	CreatedAt  time.Time
 }
 }
 
 
+type SmsStatus string
+
+const (
+	SmsWait    SmsStatus = "wait"    //等待执行
+	SmsInit    SmsStatus = "init"    //正在执行
+	SmsSuccess SmsStatus = "success" //执行成功
+	SmsFailed  SmsStatus = "failed"  //执行失败
+	SmsIgnore  SmsStatus = "ignore"  //忽略执行
+)
+
 // 每日自评 短信消息提醒
 // 每日自评 短信消息提醒
 func (sms *LogSms) SummaryEvaluationMessage(phone string, name string) {
 func (sms *LogSms) SummaryEvaluationMessage(phone string, name string) {
 	*sms = LogSms{
 	*sms = LogSms{

@@ -9,6 +9,6 @@ type LogSms struct {
 	TemplateId int               `pg:"template_id"`
 	TemplateId int               `pg:"template_id"`
 	Template   string            `pg:"template"`
 	Template   string            `pg:"template"`
 	Value      map[string]string `pg:"value"`
 	Value      map[string]string `pg:"value"`
-	CreatedAt  time.Time         `pg:"createdAt"`
+	CreatedAt  time.Time         `pg:"created_at"`
 	Result     string            `pg:"result"`
 	Result     string            `pg:"result"`
 }
 }