2024.11.7 文档收集更新

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

@@ -551,7 +551,10 @@ public class EamProjectServiceImpl implements EamProjectService {
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(proofingInformationData.getStatus()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
                     if (!Objects.equals(type, "项目物料立项")) {
-                        s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getDocumentType()).append("</td>");
+                        // 使用 <a> 标签创建可点击链接，链接地址和文本均自定义
+                        String documentLink = "<a href='http://localhost:8002/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
+                                + proofingInformationData.getDocumentType() + "</a>";
+                        s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(documentLink).append("</td>");
                         s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>");
                     }
                     s.append("</tr>");
@@ -567,7 +570,10 @@ public class EamProjectServiceImpl implements EamProjectService {
                     s.append("<td style='border: 1px solid #dddddd; padding: 8px;'></td>");
                     s.append("<td style='border: 1px solid #dddddd; padding: 8px;'></td>");
                     if (!Objects.equals(type, "项目物料立项")) {
-                        s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getDocumentType()).append("</td>");
+                        // 使用 <a> 标签创建可点击链接，链接地址和文本均自定义
+                        String documentLink = "<a href='http://localhost:8002/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
+                                + proofingInformationData.getDocumentType() + "</a>";
+                        s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(documentLink).append("</td>");
                         s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>");
                     }
                     s.append("</tr>");
@@ -696,14 +702,17 @@ public class EamProjectServiceImpl implements EamProjectService {
         if (emailAddress != null) {
             StringBuilder s = new StringBuilder();
             s.append("<ol>");
+            // 使用 <a> 标签创建可点击链接，链接地址和文本均自定义
+            String projectPartLink = "<a href='http://localhost:8002/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + inData.getDocumentDefinitionListId() + "'>"
+                    + inData.getDocumentType() + "</a>";
             if (inData.getProofingNo().equals("*")) {
                 s.append("<li>请及时上传转量产阶段文档文件!<br></br>");
                 s.append("项目编码:" + inData.getProjectNo() + "<br></br>");
-                s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" - 转量产阶段文档 文档类型:").append(inData.getDocumentType()).append(" - 截止日期:" + needDate + "</li>");
+                s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" - 转量产阶段文档 文档类型:").append(projectPartLink).append(" - 截止日期:" + needDate + "</li>");
             }else {
                 s.append("<li>请及时上传打样文档文件!<br></br>");
                 s.append("项目编码:" + inData.getProjectNo() + "<br></br>");
-                s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" 打样单号:").append(inData.getProofingNo()).append(" - 文档类型:").append(inData.getDocumentType()).append(" - 截止日期:" + requiredDeliveryDate + "</li>");
+                s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" 打样单号:").append(inData.getProofingNo()).append(" - 文档类型:").append(projectPartLink).append(" - 截止日期:" + requiredDeliveryDate + "</li>");
             }
             s.append("</ol>");
             //设置邮件内容
@@ -761,11 +770,14 @@ public class EamProjectServiceImpl implements EamProjectService {
         String wantedConfirmDate = formatter.format(inData.getWantedConfirmDate());
         //List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList());
         if (emailAddress != null) {
+            // 使用 <a> 标签创建可点击链接，链接地址和文本均自定义
+            String projectPartLink = "<a href='http://localhost:8002/#/eam-eamProjectPartInfo?projectPartId=" + inData.getProjectPartId() + "'>"
+                    + inData.getTestPartNo() + "</a>";
             StringBuilder s = new StringBuilder();
             s.append("<ol>");
             s.append("<li>有新的生产文档需要确认，请及时处理！<br></br>");
             s.append("项目编码:").append(inData.getProjectNo() + "<br></br>");
-            s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" - 截止日期:" + wantedConfirmDate + "</li>");
+            s.append("项目料号:").append(projectPartLink).append(" 料号描述:").append(inData.getPartDesc()).append(" - 截止日期:" + wantedConfirmDate + "</li>");
             s.append("</ol>");
             //设置邮件内容
             String text = "<!DOCTYPE>" +
@@ -790,6 +802,11 @@ public class EamProjectServiceImpl implements EamProjectService {
             MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
             messageHelper.setFrom(mailSendData.getEmailForm(), mailSendData.getPersonal());
 
+            // 如果emailAddress.getEmail()的第一个字符是;，则去掉第一个字符
+            if (emailAddress.getEmail().startsWith(";")) {
+                emailAddress.setEmail(emailAddress.getEmail().substring(1));
+            }
+
             // 将emailAddress的每一列的值用;分割，如果有多个收件人，将第一个收件人设置为to，其他的设置为cc
             if (emailAddress.getEmail().contains(";")) {
                 String[] toAddress = emailAddress.getEmail().split(";");
@@ -966,6 +983,16 @@ public class EamProjectServiceImpl implements EamProjectService {
         String lastTstPartNo = null;
         Integer lastDocumentDefinitionListId = -888;
         for (ProofingInformationData proofingInformationData : emailAddress) {
+            String projectPartLink = null;
+
+            if (proofingInformationData.getDocumentType().equals("打样单未完成") || proofingInformationData.getDocumentType().equals("生产文档未确认")) {
+                projectPartLink = "<a href='http://localhost:8002/#/eam-eamProjectPartInfo?projectPartId=" + proofingInformationData.getProjectPartId() + "'>"
+                        + proofingInformationData.getDocumentType() + "</a>";
+            } else {
+                projectPartLink = "<a href='http://localhost:8002/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
+                        + proofingInformationData.getDocumentType() + "</a>";
+            }
+
             // 判断如果与上一个project_id不同
             if (!Objects.equals(lastProjectId, proofingInformationData.getProjectId())) {
                 lastProjectId = proofingInformationData.getProjectId();
@@ -993,7 +1020,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(proofingInformationData.getStatus()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
-                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getDocumentType()).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
                     s.append("</tr>");
                 } else if (!Objects.equals(lastProofingNo, proofingInformationData.getProofingNo())) {   // 判断如果与上一个ProofingNo不同
                     lastProofingNo = proofingInformationData.getProofingNo();
@@ -1019,7 +1046,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(proofingInformationData.getStatus()).append("</td>");
                         s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
-                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getDocumentType()).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
                     s.append("</tr>");
                 } else {
                     s.append("<tr>");
@@ -1043,7 +1070,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(proofingInformationData.getStatus()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
-                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getDocumentType()).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
                     s.append("</tr>");
                 }
             } else {
@@ -1071,7 +1098,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(proofingInformationData.getStatus()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
-                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getDocumentType()).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
                     s.append("</tr>");
                 } else if (!Objects.equals(lastProofingNo, proofingInformationData.getProofingNo())) {  // 判断这条数据的打样单号与上一条数据的打样单号是否相同
                     lastProofingNo = proofingInformationData.getProofingNo();
@@ -1158,7 +1185,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                     }
                         s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                     s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
-                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getDocumentType()).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
                     s.append("</tr>");
                 } else {
                     s.append("<tr>");
@@ -1204,7 +1231,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                             s.append("<td style='border: 1px solid #dddddd; padding: 8px;'></td>");
                         }
                     }
-                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getDocumentType()).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
                     s.append("</tr>");
                 }
             }

src/main/resources/mapper/pms/ProofingInformationMapper.xml

@@ -317,6 +317,9 @@
             <if test="query.endDate != null ">
                 AND #{query.endDate} >= build_date
             </if>
+            <if test="query.documentDefinitionListId != null and query.documentDefinitionListId != ''">
+                AND documentDefinitionListId = #{query.documentDefinitionListId}
+            </if>
         </where>
         order by project_id
     </select>