From 9034687e8824701bb2e635db12b1697377a3179e Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 7 Nov 2024 21:15:21 +0800
Subject: [PATCH] =?UTF-8?q?2024.11.7=20=E6=96=87=E6=A1=A3=E6=94=B6?=
=?UTF-8?q?=E9=9B=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/xujie/sys/common/utils/TaskUtils.java | 2 +-
.../pms/service/Impl/EamProjectServiceImpl.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
index 98a7c0e6..9f394f48 100644
--- a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
+++ b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
@@ -46,7 +46,7 @@ public class TaskUtils {
}
// 添加未上传文件邮件通知定時任務
- //@Scheduled(cron = "${task.data.sendEmail}" )
+ @Scheduled(cron = "${task.data.sendEmail}" )
public void sendEmail() throws MessagingException, UnsupportedEncodingException {
eamProjectService.sendEmail();
}
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 e4c0e87f..bcce2d8c 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
@@ -552,7 +552,7 @@ public class EamProjectServiceImpl implements EamProjectService {
s.append("
").append(formatter.format(proofingInformationData.getDueDate())).append(" | ");
if (!Objects.equals(type, "项目物料立项")) {
// 使用 标签创建可点击链接,链接地址和文本均自定义
- String documentLink = ""
+ String documentLink = ""
+ proofingInformationData.getDocumentType() + "";
s.append("").append(documentLink).append(" | ");
s.append("").append(proofingInformationData.getUserDisplay()).append(" | ");
@@ -571,7 +571,7 @@ public class EamProjectServiceImpl implements EamProjectService {
s.append(" | ");
if (!Objects.equals(type, "项目物料立项")) {
// 使用 标签创建可点击链接,链接地址和文本均自定义
- String documentLink = ""
+ String documentLink = ""
+ proofingInformationData.getDocumentType() + "";
s.append("").append(documentLink).append(" | ");
s.append("").append(proofingInformationData.getUserDisplay()).append(" | ");
@@ -703,7 +703,7 @@ public class EamProjectServiceImpl implements EamProjectService {
StringBuilder s = new StringBuilder();
s.append("");
// 使用 标签创建可点击链接,链接地址和文本均自定义
- String projectPartLink = ""
+ String projectPartLink = ""
+ inData.getDocumentType() + "";
if (inData.getProofingNo().equals("*")) {
s.append("- 请及时上传转量产阶段文档文件!
");
@@ -771,7 +771,7 @@ public class EamProjectServiceImpl implements EamProjectService {
//List collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList());
if (emailAddress != null) {
// 使用 标签创建可点击链接,链接地址和文本均自定义
- String projectPartLink = ""
+ String projectPartLink = ""
+ inData.getTestPartNo() + "";
StringBuilder s = new StringBuilder();
s.append("");
@@ -986,10 +986,10 @@ public class EamProjectServiceImpl implements EamProjectService {
String projectPartLink = null;
if (proofingInformationData.getDocumentType().equals("打样单未完成") || proofingInformationData.getDocumentType().equals("生产文档未确认")) {
- projectPartLink = ""
+ projectPartLink = ""
+ proofingInformationData.getDocumentType() + "";
} else {
- projectPartLink = ""
+ projectPartLink = ""
+ proofingInformationData.getDocumentType() + "";
}