diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java index 8e962b8a..e4c0e87f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java @@ -551,7 +551,10 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getStatus()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); if (!Objects.equals(type, "项目物料立项")) { - s.append("").append(proofingInformationData.getDocumentType()).append(""); + // 使用 标签创建可点击链接,链接地址和文本均自定义 + String documentLink = "" + + proofingInformationData.getDocumentType() + ""; + s.append("").append(documentLink).append(""); s.append("").append(proofingInformationData.getUserDisplay()).append(""); } s.append(""); @@ -567,7 +570,10 @@ public class EamProjectServiceImpl implements EamProjectService { s.append(""); s.append(""); if (!Objects.equals(type, "项目物料立项")) { - s.append("").append(proofingInformationData.getDocumentType()).append(""); + // 使用 标签创建可点击链接,链接地址和文本均自定义 + String documentLink = "" + + proofingInformationData.getDocumentType() + ""; + s.append("").append(documentLink).append(""); s.append("").append(proofingInformationData.getUserDisplay()).append(""); } s.append(""); @@ -696,14 +702,17 @@ public class EamProjectServiceImpl implements EamProjectService { if (emailAddress != null) { StringBuilder s = new StringBuilder(); s.append("
    "); + // 使用 标签创建可点击链接,链接地址和文本均自定义 + String projectPartLink = "" + + inData.getDocumentType() + ""; if (inData.getProofingNo().equals("*")) { s.append("
  1. 请及时上传转量产阶段文档文件!

    "); s.append("项目编码:" + inData.getProjectNo() + "

    "); - s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" - 转量产阶段文档 文档类型:").append(inData.getDocumentType()).append(" - 截止日期:" + needDate + "
  2. "); + s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" - 转量产阶段文档 文档类型:").append(projectPartLink).append(" - 截止日期:" + needDate + ""); }else { s.append("
  3. 请及时上传打样文档文件!

    "); s.append("项目编码:" + inData.getProjectNo() + "

    "); - s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" 打样单号:").append(inData.getProofingNo()).append(" - 文档类型:").append(inData.getDocumentType()).append(" - 截止日期:" + requiredDeliveryDate + "
  4. "); + s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" 打样单号:").append(inData.getProofingNo()).append(" - 文档类型:").append(projectPartLink).append(" - 截止日期:" + requiredDeliveryDate + ""); } s.append("
"); //设置邮件内容 @@ -761,11 +770,14 @@ public class EamProjectServiceImpl implements EamProjectService { String wantedConfirmDate = formatter.format(inData.getWantedConfirmDate()); //List collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList()); if (emailAddress != null) { + // 使用 标签创建可点击链接,链接地址和文本均自定义 + String projectPartLink = "" + + inData.getTestPartNo() + ""; StringBuilder s = new StringBuilder(); s.append("
    "); s.append("
  1. 有新的生产文档需要确认,请及时处理!

    "); s.append("项目编码:").append(inData.getProjectNo() + "

    "); - s.append("项目料号:").append(inData.getTestPartNo()).append(" 料号描述:").append(inData.getPartDesc()).append(" - 截止日期:" + wantedConfirmDate + "
  2. "); + s.append("项目料号:").append(projectPartLink).append(" 料号描述:").append(inData.getPartDesc()).append(" - 截止日期:" + wantedConfirmDate + ""); s.append("
"); //设置邮件内容 String text = "" + @@ -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 = "" + + proofingInformationData.getDocumentType() + ""; + } else { + projectPartLink = "" + + proofingInformationData.getDocumentType() + ""; + } + // 判断如果与上一个project_id不同 if (!Objects.equals(lastProjectId, proofingInformationData.getProjectId())) { lastProjectId = proofingInformationData.getProjectId(); @@ -993,7 +1020,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getStatus()).append(""); s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); - s.append("").append(proofingInformationData.getDocumentType()).append(""); + s.append("").append(projectPartLink).append(""); s.append(""); } else if (!Objects.equals(lastProofingNo, proofingInformationData.getProofingNo())) { // 判断如果与上一个ProofingNo不同 lastProofingNo = proofingInformationData.getProofingNo(); @@ -1019,7 +1046,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getStatus()).append(""); s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); - s.append("").append(proofingInformationData.getDocumentType()).append(""); + s.append("").append(projectPartLink).append(""); s.append(""); } else { s.append(""); @@ -1043,7 +1070,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getStatus()).append(""); s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); - s.append("").append(proofingInformationData.getDocumentType()).append(""); + s.append("").append(projectPartLink).append(""); s.append(""); } } else { @@ -1071,7 +1098,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getStatus()).append(""); s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); - s.append("").append(proofingInformationData.getDocumentType()).append(""); + s.append("").append(projectPartLink).append(""); s.append(""); } else if (!Objects.equals(lastProofingNo, proofingInformationData.getProofingNo())) { // 判断这条数据的打样单号与上一条数据的打样单号是否相同 lastProofingNo = proofingInformationData.getProofingNo(); @@ -1158,7 +1185,7 @@ public class EamProjectServiceImpl implements EamProjectService { } s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); - s.append("").append(proofingInformationData.getDocumentType()).append(""); + s.append("").append(projectPartLink).append(""); s.append(""); } else { s.append(""); @@ -1204,7 +1231,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append(""); } } - s.append("").append(proofingInformationData.getDocumentType()).append(""); + s.append("").append(projectPartLink).append(""); s.append(""); } } diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml index 711fcf8d..92d95584 100644 --- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml @@ -317,6 +317,9 @@ AND #{query.endDate} >= build_date + + AND documentDefinitionListId = #{query.documentDefinitionListId} + order by project_id