|
|
|
@ -863,7 +863,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
} |
|
|
|
} |
|
|
|
// 计划员 |
|
|
|
for (Long id : plannerIds) { |
|
|
|
/* for (Long id : plannerIds) { |
|
|
|
if (!completedPlanners.contains(id)) { |
|
|
|
boolean isCurrent = activeNodesByUser |
|
|
|
.getOrDefault(id, Collections.emptySet()) |
|
|
|
@ -873,7 +873,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
*/ |
|
|
|
log.info("=== 手动催办完成 === 试验单: {}, 成功发送邮件人数: {}", applyNo, sentCount); |
|
|
|
return sentCount; |
|
|
|
} |
|
|
|
@ -1011,21 +1011,25 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
* 构建试验单信息HTML表格 |
|
|
|
*/ |
|
|
|
private String buildApplyInfoTable(ErfExpApply apply, String submitTimeStr) { |
|
|
|
return "<table border='1' cellpadding='8' cellspacing='0' style='border-collapse:collapse;width:100%;margin-bottom:16px;'>" |
|
|
|
+ "<thead style='background-color:#FDF6EC;'><tr>" |
|
|
|
+ "<th align='center'>试验单号</th>" |
|
|
|
+ "<th align='center'>事业部</th>" |
|
|
|
+ "<th align='center'>试验名称</th>" |
|
|
|
+ "<th align='center'>试验类型</th>" |
|
|
|
+ "<th align='center'>试验负责人</th>" |
|
|
|
+ "<th align='center'>下达时间</th>" |
|
|
|
String expectedFinishDateStr = apply.getExpectedFinishDate() != null |
|
|
|
? DateTimeFormatter.ofPattern("yyyy-MM-dd") |
|
|
|
.format(apply.getExpectedFinishDate().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDateTime()) |
|
|
|
: ""; |
|
|
|
return "<table border='1' cellpadding='6' cellspacing='0' " |
|
|
|
+ "style='border-collapse:collapse; width:100%; font-size:13px;'>" |
|
|
|
+ "<thead style='background-color:#2196F3; color:white;'><tr>" |
|
|
|
+ "<th>收到邮件日期</th><th>项目号</th><th>试验单号</th><th>项目名称</th>" |
|
|
|
+ "<th>安排生产工序</th><th>数量</th><th>备注</th><th>需求日期</th><th>工程师</th>" |
|
|
|
+ "</tr></thead><tbody><tr>" |
|
|
|
+ "<td align='center'><b>" + apply.getApplyNo() + "</b></td>" |
|
|
|
+ "<td align='center'>" + nvl(apply.getBuNo()) + "</td>" |
|
|
|
+ "<td>" + submitTimeStr + "</td>" |
|
|
|
+ "<td>" + nvl(apply.getProjectNo()) + "</td>" |
|
|
|
+ "<td>" + nvl(apply.getApplyNo()) + "</td>" |
|
|
|
+ "<td>" + nvl(apply.getTitle()) + "</td>" |
|
|
|
+ "<td align='center'>" + nvl(apply.getExperimentType()) + "</td>" |
|
|
|
+ "<td align='center'>" + nvl(apply.getProjectLeader()) + "</td>" |
|
|
|
+ "<td align='center'>" + submitTimeStr + "</td>" |
|
|
|
+ "<td>" + nvl(apply.getProcessRequirement()) + "</td>" |
|
|
|
+ "<td>" + nvl(apply.getQuantityReq()) + "</td>" |
|
|
|
+ "<td>" + nvl(apply.getRemark()) + "</td>" |
|
|
|
+ "<td>" + expectedFinishDateStr + "</td>" |
|
|
|
+ "<td>" + nvl(apply.getProjectLeader()) + "</td>" |
|
|
|
+ "</tr></tbody></table>"; |
|
|
|
} |
|
|
|
|
|
|
|
|
