diff --git a/src/main/java/com/xujie/sys/modules/pms/data/SendMailRecord.java b/src/main/java/com/xujie/sys/modules/pms/data/SendMailRecord.java new file mode 100644 index 00000000..a10eb0ad --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/data/SendMailRecord.java @@ -0,0 +1,20 @@ +package com.xujie.sys.modules.pms.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +public class SendMailRecord { + private Integer id; + private String site; + private String buNo; + private String documentNo; + private String sender; + private String recipient; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date sendDate; +} diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index 20cd8b7e..28f814c5 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java @@ -470,4 +470,6 @@ public interface QcMapper { MailAddressData getSendMailAddress(@Param("site") String site, @Param("type") String type); MailSendAddressData getSendMailFromAddress(); + + void saveSendMailRecord(SendMailRecord mailRecord); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index bec3e8e8..6a09fe37 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -2118,6 +2118,7 @@ public class QcServiceImpl implements QcService { // 设置utf-8或GBK编码,否则邮件会有乱码 MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8"); messageHelper.setFrom(mailSendData.getEmailForm(), mailSendData.getPersonal()); + //判断是否存在分号 if (qc.getMailAddress().contains(";")) { String[] toAddress = qc.getMailAddress().split(";"); @@ -2132,6 +2133,15 @@ public class QcServiceImpl implements QcService { messageHelper.setText(text, true); sender.send(mimeMessage); logger.info(type + "检验不合格通知邮件已发送!收件箱地址:"+qc.getMailAddress()); + + // 保存邮件记录 + SendMailRecord mailRecord = new SendMailRecord(); + mailRecord.setSite(data.getSite()); + mailRecord.setBuNo(data.getBuNo()); + mailRecord.setDocumentNo(data.getInspectionNo()); + mailRecord.setSender(data.getInspectorNo()); + mailRecord.setRecipient(qc.getMailAddress()); + qcMapper.saveSendMailRecord(mailRecord); } } @@ -3808,6 +3818,15 @@ public class QcServiceImpl implements QcService { messageHelper.setText(text, true); sender.send(mimeMessage); logger.info("QC检验不合格通知邮件已发送!收件箱地址:"+qc.getMailAddress()); + + // 保存邮件记录 + SendMailRecord mailRecord = new SendMailRecord(); + mailRecord.setSite(data.getSite()); + mailRecord.setBuNo(data.getBuNo()); + mailRecord.setDocumentNo(data.getInspectionNo()); + mailRecord.setSender(data.getInspectorNo()); + mailRecord.setRecipient(qc.getMailAddress()); + qcMapper.saveSendMailRecord(mailRecord); } } } catch (Exception e) { diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 4192b58b..1dcf578b 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -3246,6 +3246,14 @@ FROM mailSendAddress where delFlag = 'N' + + + + insert into send_mail_record + (site, bu_no, document_no, sender, recipient, send_date) + values + (#{site}, #{buNo}, #{documentNo}, #{sender}, #{recipient}, getDate()) +