Commit 4fc4ddfc by “zcwang”

modify:邮件发送

parent e0158808
...@@ -317,6 +317,7 @@ public class ChangeFlowBiz { ...@@ -317,6 +317,7 @@ public class ChangeFlowBiz {
*/ */
public void qcSendEmail(String changeCommander, String subjectParam, EmailTemplateEnum emailTemplateEnum, public void qcSendEmail(String changeCommander, String subjectParam, EmailTemplateEnum emailTemplateEnum,
Map<String, Object> param) { Map<String, Object> param) {
try {
IusDepartmentReq iusDepartmentReq = new IusDepartmentReq(); IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
iusDepartmentReq.setHasOrgPos(true); iusDepartmentReq.setHasOrgPos(true);
iusDepartmentReq.setIcac(true); iusDepartmentReq.setIcac(true);
...@@ -332,6 +333,10 @@ public class ChangeFlowBiz { ...@@ -332,6 +333,10 @@ public class ChangeFlowBiz {
ccList.add(appConfig.getChangeManageQM()); ccList.add(appConfig.getChangeManageQM());
iEmailService.sendEmail(Collections.singletonList(changeCommander), ccList, param, emailTemplateEnum, iEmailService.sendEmail(Collections.singletonList(changeCommander), ccList, param, emailTemplateEnum,
subjectParam); subjectParam);
} catch (Exception e) {
log.error("[op:qcSendEmail] error,changeCommander:{}, subjectParam:{}, e:{}", changeCommander, subjectParam,
e);
}
} }
private List<ChangeFile> buildChangeFileRecord(Long changeRecordId, List<ChangeFlowFile> files, Integer type) { private List<ChangeFile> buildChangeFileRecord(Long changeRecordId, List<ChangeFlowFile> files, Integer type) {
......
...@@ -39,6 +39,7 @@ public class SupplierSendService { ...@@ -39,6 +39,7 @@ public class SupplierSendService {
public void sendSupplierEmail(String supplier, String subjectParam, EmailTemplateEnum emailTemplateEnum, public void sendSupplierEmail(String supplier, String subjectParam, EmailTemplateEnum emailTemplateEnum,
Map<String, Object> param) { Map<String, Object> param) {
try {
SupplierSendEmailReq req = new SupplierSendEmailReq(); SupplierSendEmailReq req = new SupplierSendEmailReq();
req.setSupplierId(supplier); req.setSupplierId(supplier);
req.setMailSubject(subjectParam); req.setMailSubject(subjectParam);
...@@ -47,6 +48,9 @@ public class SupplierSendService { ...@@ -47,6 +48,9 @@ public class SupplierSendService {
req.setMailContent(this.content(factor)); req.setMailContent(this.content(factor));
log.debug("[sendSupplierEmail] 发送供应商邮件内容 subjectParam:{}, req:{}", subjectParam, JSON.toJSONString(req)); log.debug("[sendSupplierEmail] 发送供应商邮件内容 subjectParam:{}, req:{}", subjectParam, JSON.toJSONString(req));
flowRpcSupplierSendService.sendEmail(req); flowRpcSupplierSendService.sendEmail(req);
} catch (Exception e) {
log.error("[op:sendSupplierEmail] error,supplier:{},subjectParam:{}, e:{}", supplier, subjectParam, e);
}
} }
/** /**
......
...@@ -33,6 +33,5 @@ public class ChangeFlowDeliverReq { ...@@ -33,6 +33,5 @@ public class ChangeFlowDeliverReq {
/** /**
* 转交备注 * 转交备注
*/ */
@NotBlank(message = "转交备注不可为空")
private String remark; private String remark;
} }
\ No newline at end of file
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