|
|
@ -2093,7 +2093,7 @@ public class QcServiceImpl implements QcService { |
|
|
*/ |
|
|
*/ |
|
|
public void sendMail(QcFAIRecordData data, String type) throws Exception { |
|
|
public void sendMail(QcFAIRecordData data, String type) throws Exception { |
|
|
// 获取数据库设置的邮件接收地址 |
|
|
// 获取数据库设置的邮件接收地址 |
|
|
MailAddressData qc = qcMapper.getSendMailAddress(data.getSite(), "qc"); |
|
|
|
|
|
|
|
|
MailAddressData qc = qcMapper.getSendMailAddress(data.getSite(), "QC"); |
|
|
List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList()); |
|
|
List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList()); |
|
|
if (qc != null) { |
|
|
if (qc != null) { |
|
|
//设置邮件内容 |
|
|
//设置邮件内容 |
|
|
@ -3769,7 +3769,7 @@ public class QcServiceImpl implements QcService { |
|
|
// 判断检验结论,不合格则发送邮件 |
|
|
// 判断检验结论,不合格则发送邮件 |
|
|
if ("不合格".equals(data.getInspectionResult())) { |
|
|
if ("不合格".equals(data.getInspectionResult())) { |
|
|
// 获取数据库设置的邮件接收地址 |
|
|
// 获取数据库设置的邮件接收地址 |
|
|
MailAddressData qc = qcMapper.getSendMailAddress(data.getSite(), "qc"); |
|
|
|
|
|
|
|
|
MailAddressData qc = qcMapper.getSendMailAddress(data.getSite(), "IQC"); |
|
|
List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList()); |
|
|
List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList()); |
|
|
if (qc != null) { |
|
|
if (qc != null) { |
|
|
//设置邮件内容 |
|
|
//设置邮件内容 |
|
|
|