正在显示
2 个修改的文件
包含
19 行增加
和
7 行删除
@@ -21,11 +21,11 @@ func (notices notifyConfirmEvaluationScore) from() string { | @@ -21,11 +21,11 @@ func (notices notifyConfirmEvaluationScore) from() string { | ||
21 | func (notices notifyConfirmEvaluationScore) makeNotify(param *domain.SummaryEvaluation) *domain.LogSms { | 21 | func (notices notifyConfirmEvaluationScore) makeNotify(param *domain.SummaryEvaluation) *domain.LogSms { |
22 | newSms := domain.LogSms{ | 22 | newSms := domain.LogSms{ |
23 | Id: 0, | 23 | Id: 0, |
24 | - Phone: param.Executor.Account, | 24 | + Phone: param.TargetUser.Account, |
25 | TemplateId: 5634326, | 25 | TemplateId: 5634326, |
26 | Template: "您好,#name#,#periodName#成绩已出,请前往绩效系统PC端进行确认哦,超时未确认可能会影响当月绩效工资哦~ ", | 26 | Template: "您好,#name#,#periodName#成绩已出,请前往绩效系统PC端进行确认哦,超时未确认可能会影响当月绩效工资哦~ ", |
27 | Value: map[string]string{ | 27 | Value: map[string]string{ |
28 | - "name": param.Executor.UserName, | 28 | + "name": param.TargetUser.UserName, |
29 | "periodName": param.CycleName, | 29 | "periodName": param.CycleName, |
30 | }, | 30 | }, |
31 | Result: "", | 31 | Result: "", |
@@ -668,6 +668,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain. | @@ -668,6 +668,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain. | ||
668 | if err != nil { | 668 | if err != nil { |
669 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | 669 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) |
670 | } | 670 | } |
671 | + //添加确认绩效成绩提醒短信提醒 | ||
672 | + err = notify.AddNotifyConfirmEvaluationScore(evaluationFinishList[0]) | ||
673 | + if err != nil { | ||
674 | + return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error()) | ||
675 | + } | ||
671 | } | 676 | } |
672 | } | 677 | } |
673 | if err := transactionContext.CommitTransaction(); err != nil { | 678 | if err := transactionContext.CommitTransaction(); err != nil { |
@@ -767,7 +772,13 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma | @@ -767,7 +772,13 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma | ||
767 | if err != nil { | 772 | if err != nil { |
768 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | 773 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) |
769 | } | 774 | } |
775 | + //添加确认绩效成绩提醒短信提醒 | ||
776 | + err = notify.AddNotifyConfirmEvaluationScore(evaluationFinishList[0]) | ||
777 | + if err != nil { | ||
778 | + return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error()) | ||
779 | + } | ||
770 | } | 780 | } |
781 | + | ||
771 | } | 782 | } |
772 | if err := transactionContext.CommitTransaction(); err != nil { | 783 | if err := transactionContext.CommitTransaction(); err != nil { |
773 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 784 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
@@ -824,16 +835,17 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain | @@ -824,16 +835,17 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain | ||
824 | if err != nil { | 835 | if err != nil { |
825 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) | 836 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果,"+err.Error()) |
826 | } | 837 | } |
838 | + //添加确认绩效成绩提醒短信提醒 | ||
839 | + err = notify.AddNotifyConfirmEvaluationScore(evaluationList[0]) | ||
840 | + if err != nil { | ||
841 | + return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error()) | ||
842 | + } | ||
827 | } | 843 | } |
828 | 844 | ||
829 | if err := transactionContext.CommitTransaction(); err != nil { | 845 | if err := transactionContext.CommitTransaction(); err != nil { |
830 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 846 | return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
831 | } | 847 | } |
832 | - //添加确认绩效成绩提醒短信提醒 | ||
833 | - err = notify.AddNotifyConfirmEvaluationScore(param) | ||
834 | - if err != nil { | ||
835 | - return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error()) | ||
836 | - } | 848 | + |
837 | return nil | 849 | return nil |
838 | } | 850 | } |
839 | 851 |
-
请 注册 或 登录 后发表评论