Commit 44965220 by “zcwang”

modify:邮件发送

parent 10d62aa1
...@@ -274,7 +274,7 @@ public class ChangeFlowBiz { ...@@ -274,7 +274,7 @@ public class ChangeFlowBiz {
+ changeRecord.getId().toString(); + changeRecord.getId().toString();
qcSendEmail(changeCommander, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param); qcSendEmail(changeCommander, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param); EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
} }
...@@ -301,7 +301,7 @@ public class ChangeFlowBiz { ...@@ -301,7 +301,7 @@ public class ChangeFlowBiz {
String subjectParam = changeRecord.getId().toString(); String subjectParam = changeRecord.getId().toString();
qcSendEmail(changeCommander, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param); qcSendEmail(changeCommander, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param); EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
} }
...@@ -534,7 +534,7 @@ public class ChangeFlowBiz { ...@@ -534,7 +534,7 @@ public class ChangeFlowBiz {
qcSendEmail(changeRecord.getChangeCommander(), subjectParam, qcSendEmail(changeRecord.getChangeCommander(), subjectParam,
EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param); EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param); EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
} }
...@@ -594,7 +594,7 @@ public class ChangeFlowBiz { ...@@ -594,7 +594,7 @@ public class ChangeFlowBiz {
qcSendEmail(changeRecord.getChangeCommander(), finishSubjectParam, qcSendEmail(changeRecord.getChangeCommander(), finishSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap); EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), finishSubjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), finishSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap); EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
} }
...@@ -623,7 +623,7 @@ public class ChangeFlowBiz { ...@@ -623,7 +623,7 @@ public class ChangeFlowBiz {
qcSendEmail(changeRecord.getChangeCommander(), cancelSubjectParam, qcSendEmail(changeRecord.getChangeCommander(), cancelSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap); EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap); EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
} }
...@@ -719,7 +719,7 @@ public class ChangeFlowBiz { ...@@ -719,7 +719,7 @@ public class ChangeFlowBiz {
String cancelSubjectParam = changeRecord.getId().toString(); String cancelSubjectParam = changeRecord.getId().toString();
qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap); qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap); EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
} }
...@@ -1034,7 +1034,7 @@ public class ChangeFlowBiz { ...@@ -1034,7 +1034,7 @@ public class ChangeFlowBiz {
String cancelSubjectParam = changeRecord.getId().toString(); String cancelSubjectParam = changeRecord.getId().toString();
qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap); qcSendEmail(changeCommander, cancelSubjectParam, EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap);
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap); EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, cancelMap);
} }
......
...@@ -141,7 +141,7 @@ public class AutoSubmit extends IJobHandler { ...@@ -141,7 +141,7 @@ public class AutoSubmit extends IJobHandler {
changeFlowBiz.qcSendEmail(changeRecord.getChangeCommander(), subjectParam, changeFlowBiz.qcSendEmail(changeRecord.getChangeCommander(), subjectParam,
EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map); EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map); EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
} }
......
...@@ -116,7 +116,7 @@ public class TestController { ...@@ -116,7 +116,7 @@ public class TestController {
changeFlowBiz.qcSendEmail(appConfig.getSendEmail(), subjectParam, changeFlowBiz.qcSendEmail(appConfig.getSendEmail(), subjectParam,
emailTemplateEnum, JSON.parseObject(mapToJson, Map.class)); emailTemplateEnum, JSON.parseObject(mapToJson, Map.class));
// 如果是供应商,再次发送供应商邮件 // 如果是供应商,再次发送供应商邮件
if (req.getCreateSource().equals(CreateSourceEnum.QC.getType())) { if (req.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
Assert.notNull(req.getChangeSupplier(), "同舟端负责人不可为空"); Assert.notNull(req.getChangeSupplier(), "同舟端负责人不可为空");
sendSupplierEmail.sendSupplierEmail(req.getChangeSupplier(), subjectParam, sendSupplierEmail.sendSupplierEmail(req.getChangeSupplier(), subjectParam,
emailTemplateEnum, JSON.parseObject(mapToJson, Map.class)); emailTemplateEnum, JSON.parseObject(mapToJson, Map.class));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment