Commit 99198ee7 by “zcwang”

modify: 统一邮件内容

parent e686711e
Pipeline #44341 passed with stages
in 3 minutes 10 seconds
...@@ -669,7 +669,7 @@ public class ChangeFlowBiz { ...@@ -669,7 +669,7 @@ public class ChangeFlowBiz {
if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType()) if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
&& ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) { && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, param); EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
} }
return submitNode; return submitNode;
case CHANGE_FLOW_CONFIRM: case CHANGE_FLOW_CONFIRM:
...@@ -754,7 +754,7 @@ public class ChangeFlowBiz { ...@@ -754,7 +754,7 @@ public class ChangeFlowBiz {
if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType()) if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
&& ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) { && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), finishSubjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), finishSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, finishPartMap); EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
} }
return confirmNode; return confirmNode;
case CANCEL: case CANCEL:
...@@ -813,7 +813,7 @@ public class ChangeFlowBiz { ...@@ -813,7 +813,7 @@ public class ChangeFlowBiz {
if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType()) if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
&& ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) { && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelFinishSubjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelFinishSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, cancelMap); EmailTemplateEnum.YX_QC_CHANGE_FINISH, cancelMap);
} }
return cancelNode; return cancelNode;
case DELAY: case DELAY:
...@@ -922,7 +922,7 @@ public class ChangeFlowBiz { ...@@ -922,7 +922,7 @@ public class ChangeFlowBiz {
if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType()) if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
&& ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) { && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), cancelSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, cancelMap); EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_CANCEL, cancelMap);
} }
return changeFlowService.updateRecord(changeRecord); return changeFlowService.updateRecord(changeRecord);
} }
...@@ -1383,7 +1383,7 @@ public class ChangeFlowBiz { ...@@ -1383,7 +1383,7 @@ public class ChangeFlowBiz {
if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType()) if (!changeRecord.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
&& ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) { && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), deliverSubjectParam, sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), deliverSubjectParam,
EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, deliverMap); EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD, deliverMap);
} }
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
} }
......
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