|
|
@ -265,7 +265,7 @@ public class EamProjectServiceImpl implements EamProjectService { |
|
|
EamProjectMapper.eamProjectPartInfoEdit(inData); |
|
|
EamProjectMapper.eamProjectPartInfoEdit(inData); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if(inData.getStatus2() == "进行中") { |
|
|
|
|
|
|
|
|
if(Objects.equals(inData.getStatus2(), "进行中")) { |
|
|
try { |
|
|
try { |
|
|
EamProjectPartInfoData eamProjectPartInfoData = new EamProjectPartInfoData(); |
|
|
EamProjectPartInfoData eamProjectPartInfoData = new EamProjectPartInfoData(); |
|
|
eamProjectPartInfoData.setProjectPartId(inData.getProjectPartId()); |
|
|
eamProjectPartInfoData.setProjectPartId(inData.getProjectPartId()); |
|
|
@ -570,7 +570,7 @@ public class EamProjectServiceImpl implements EamProjectService { |
|
|
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; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>"); |
|
|
if (!Objects.equals(type, "项目物料立项")) { |
|
|
if (!Objects.equals(type, "项目物料立项")) { |
|
|
// 使用 <a> 标签创建可点击链接,链接地址和文本均自定义 |
|
|
// 使用 <a> 标签创建可点击链接,链接地址和文本均自定义 |
|
|
String documentLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>" |
|
|
|
|
|
|
|
|
String documentLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>" |
|
|
+ proofingInformationData.getDocumentType() + "</a>"; |
|
|
+ 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(documentLink).append("</td>"); |
|
|
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>"); |
|
|
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>"); |
|
|
@ -589,7 +589,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;'></td>"); |
|
|
if (!Objects.equals(type, "项目物料立项")) { |
|
|
if (!Objects.equals(type, "项目物料立项")) { |
|
|
// 使用 <a> 标签创建可点击链接,链接地址和文本均自定义 |
|
|
// 使用 <a> 标签创建可点击链接,链接地址和文本均自定义 |
|
|
String documentLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>" |
|
|
|
|
|
|
|
|
String documentLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>" |
|
|
+ proofingInformationData.getDocumentType() + "</a>"; |
|
|
+ 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(documentLink).append("</td>"); |
|
|
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>"); |
|
|
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>"); |
|
|
@ -721,7 +721,7 @@ public class EamProjectServiceImpl implements EamProjectService { |
|
|
StringBuilder s = new StringBuilder(); |
|
|
StringBuilder s = new StringBuilder(); |
|
|
s.append("<ol>"); |
|
|
s.append("<ol>"); |
|
|
// 使用 <a> 标签创建可点击链接,链接地址和文本均自定义 |
|
|
// 使用 <a> 标签创建可点击链接,链接地址和文本均自定义 |
|
|
String projectPartLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + inData.getDocumentDefinitionListId() + "'>" |
|
|
|
|
|
|
|
|
String projectPartLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + inData.getDocumentDefinitionListId() + "'>" |
|
|
+ inData.getDocumentType() + "</a>"; |
|
|
+ inData.getDocumentType() + "</a>"; |
|
|
if (inData.getProofingNo().equals("*")) { |
|
|
if (inData.getProofingNo().equals("*")) { |
|
|
s.append("<li>请及时上传转量产阶段文档文件!<br></br>"); |
|
|
s.append("<li>请及时上传转量产阶段文档文件!<br></br>"); |
|
|
@ -789,7 +789,7 @@ public class EamProjectServiceImpl implements EamProjectService { |
|
|
//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 (emailAddress != null) { |
|
|
if (emailAddress != null) { |
|
|
// 使用 <a> 标签创建可点击链接,链接地址和文本均自定义 |
|
|
// 使用 <a> 标签创建可点击链接,链接地址和文本均自定义 |
|
|
String projectPartLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectPartInfo?projectPartId=" + inData.getProjectPartId() + "'>" |
|
|
|
|
|
|
|
|
String projectPartLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectPartInfo?projectPartId=" + inData.getProjectPartId() + "'>" |
|
|
+ inData.getTestPartNo() + "</a>"; |
|
|
+ inData.getTestPartNo() + "</a>"; |
|
|
StringBuilder s = new StringBuilder(); |
|
|
StringBuilder s = new StringBuilder(); |
|
|
s.append("<ol>"); |
|
|
s.append("<ol>"); |
|
|
@ -1038,10 +1038,10 @@ public class EamProjectServiceImpl implements EamProjectService { |
|
|
String projectPartLink = null; |
|
|
String projectPartLink = null; |
|
|
|
|
|
|
|
|
if (proofingInformationData.getDocumentType().equals("打样单未完成") || proofingInformationData.getDocumentType().equals("生产文档未确认")) { |
|
|
if (proofingInformationData.getDocumentType().equals("打样单未完成") || proofingInformationData.getDocumentType().equals("生产文档未确认")) { |
|
|
projectPartLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectPartInfo?projectPartId=" + proofingInformationData.getProjectPartId() + "'>" |
|
|
|
|
|
|
|
|
projectPartLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectPartInfo?projectPartId=" + proofingInformationData.getProjectPartId() + "'>" |
|
|
+ proofingInformationData.getDocumentType() + "</a>"; |
|
|
+ proofingInformationData.getDocumentType() + "</a>"; |
|
|
} else { |
|
|
} else { |
|
|
projectPartLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>" |
|
|
|
|
|
|
|
|
projectPartLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>" |
|
|
+ proofingInformationData.getDocumentType() + "</a>"; |
|
|
+ proofingInformationData.getDocumentType() + "</a>"; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|