Commit 9f92041d by 穆龙飞

modify:修改自动提交本地节点

parent bce778d5
...@@ -15,11 +15,11 @@ public enum EmailTemplateEnum { ...@@ -15,11 +15,11 @@ public enum EmailTemplateEnum {
YX_QC_CHANGE_SUBMIT_FORWARD("yx_qc_change_submit_forward","变更转交","%s 变更工单转交通知"), YX_QC_CHANGE_SUBMIT_FORWARD("yx_qc_change_submit_forward","变更转交","%s 变更工单转交通知"),
YX_QC_CHANGE_EXECUTE(" yx_qc_change_execute","变更执行","【待处理】变更行动项确认 %s %s %s"), YX_QC_CHANGE_EXECUTE(" yx_qc_change_execute","变更执行","【待处理】变更行动项确认 %s"),
YX_QC_CHANGE_AFFIRM("yx_qc_change_affirm","变更确认","【待处理】变更结果确认 %s %s %s"), YX_QC_CHANGE_AFFIRM("yx_qc_change_affirm","变更确认","【待处理】变更结果确认 %s"),
YX_QC_CHANGE_FINISH("yx_qc_change_finish","工单完结","【已完结】%s %s %s 变更风险行动项已完结,请开始执行变更。"), YX_QC_CHANGE_FINISH("yx_qc_change_finish","工单完结","【已完结】%s 变更风险行动项已完结,请开始执行变更。"),
YX_QC_CHANGE_PENDING("yx_qc_change_pending","待处理","【待处理】执行标准号 执行标准名称已变更 请排查对应的商品变更"); YX_QC_CHANGE_PENDING("yx_qc_change_pending","待处理","【待处理】执行标准号 执行标准名称已变更 请排查对应的商品变更");
/** /**
......
...@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -26,7 +27,7 @@ public class EmailServiceImpl implements IEmailService { ...@@ -26,7 +27,7 @@ public class EmailServiceImpl implements IEmailService {
@Override @Override
@Async("asyncEmail") @Async("asyncEmail")
public void sendEmail(Collection<String> toList, Collection<String> ccList, public void sendEmail(Collection<String> toList, Collection<String> ccList,
HashMap<String,Object> map, EmailTemplateEnum emailTemplateEnum, List<String>subjectParams) { HashMap<String, Object> map, EmailTemplateEnum emailTemplateEnum, List<String> subjectParams) {
EmailFactor emailFactor = new EmailFactor(); EmailFactor emailFactor = new EmailFactor();
//固定 //固定
emailFactor.setType(EmailTypeEnum.TEXT.getType()); emailFactor.setType(EmailTypeEnum.TEXT.getType());
...@@ -42,8 +43,8 @@ public class EmailServiceImpl implements IEmailService { ...@@ -42,8 +43,8 @@ public class EmailServiceImpl implements IEmailService {
} }
String subject = emailFactor.getSubject(); String subject = emailFactor.getSubject();
//标题参数处理 //标题参数处理
if (subjectParams != null){ if (subjectParams != null) {
subject = String.format(subject,subjectParams.toArray()); subject = String.format(subject, subjectParams.get(0));
} }
uasClient.sendEmail(subject, content, toList, ccList, null); uasClient.sendEmail(subject, content, toList, ccList, null);
} }
......
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