2024-06-25

功能优化

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -2126,7 +2126,7 @@ public class QcServiceImpl implements QcService {
     public void sendMail(QcFAIRecordData data, String type) throws Exception {
         // 获取数据库设置的邮件接收地址
         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) {
             List<Object> params = new ArrayList<>();
             params.add(data.getSite());
@@ -2135,12 +2135,17 @@ public class QcServiceImpl implements QcService {
             //执行方法
             List<Map<String, Object>> resultList = procedureDao.getProcedureData("Get_Email_push_template", params);
 
+            StringBuilder s = new StringBuilder();
+            s.append("<ol>");
+            for (Map<String, Object> map : resultList) {
+                s.append("<li style='margin-top: 10px'>").append(map.get("Description")).append("</li>");
+            }
+            s.append("</ol>");
             //设置邮件内容
-//            String text = "<!DOCTYPE>" +
-//                    "<div>" +
-//                    "检验单号："+ data.getInspectionNo() + "，物料编码：" + data.getPartNo() + "，物料名称：" + data.getPartDesc() + "，发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
-//                    "</div>";
-            String text = resultList.toString();
+            String text = "<!DOCTYPE>" +
+                    "<div>" +
+                    s +
+                    "</div>";
             //发送邮件
             JavaMailSenderImpl sender = new JavaMailSenderImpl();
             MailSendAddressData mailSendData = qcMapper.getSendMailFromAddress();
@@ -4128,7 +4133,7 @@ public class QcServiceImpl implements QcService {
         if ("不合格".equals(data.getInspectionResult())) {
             // 获取数据库设置的邮件接收地址
             MailAddressData qc = qcMapper.getSendMailAddress(data.getSite(), type);
-            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) {
                 List<Object> params = new ArrayList<>();
                 params.add(data.getSite());
@@ -4137,12 +4142,17 @@ public class QcServiceImpl implements QcService {
                 //执行方法
                 List<Map<String, Object>> resultList = procedureDao.getProcedureData("Get_Email_push_template", params);
 
+                StringBuilder s = new StringBuilder();
+                s.append("<ol>");
+                for (Map<String, Object> map : resultList) {
+                    s.append("<li style='margin-top: 10px'>").append(map.get("Description")).append("</li>");
+                }
+                s.append("</ol>");
                 //设置邮件内容
-//                String text = "<!DOCTYPE>" +
-//                        "<div>" +
-//                        "单据号："+ data.getPoOrderNo() + "，行号：" + data.getPoItemNo() + "，物料编码：" + data.getPartNo() + "，物料名称：" + data.getPartDesc() + "，SKU：" + data.getSku() + "，发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
-//                        "</div>";
-                String text = resultList.toString();
+                String text = "<!DOCTYPE>" +
+                        "<div>" +
+                        s +
+                        "</div>";
                 //发送邮件
                 JavaMailSenderImpl sender = new JavaMailSenderImpl();
                 MailSendAddressData mailSendData = qcMapper.getSendMailFromAddress();