|
|
|
@ -99,7 +99,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
// 2. 获取申请单号列表,查询申请单状态 |
|
|
|
// 2. 获取试验单号列表,查询申请单状态 |
|
|
|
List<String> applyNos = nodeList.stream() |
|
|
|
.map(ErfFlowNodeInstance::getApplyNo) |
|
|
|
.distinct() |
|
|
|
@ -173,7 +173,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
// 2. 获取申请单号列表,查询申请单状态 |
|
|
|
// 2. 获取试验单号列表,查询申请单状态 |
|
|
|
List<String> applyNos = nodeList.stream() |
|
|
|
.map(ErfFlowNodeInstance::getApplyNo) |
|
|
|
.distinct() |
|
|
|
@ -376,7 +376,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
/** |
|
|
|
* 检查上一道工序是否已完成三方确认 |
|
|
|
* |
|
|
|
* @param applyNo 申请单号 |
|
|
|
* @param applyNo 试验单号 |
|
|
|
* @param currentSeq 当前工序顺序号 |
|
|
|
* @return true=上一道已完成, false=上一道未完成 |
|
|
|
*/ |
|
|
|
@ -397,7 +397,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
/** |
|
|
|
* 检查某个角色是否已确认 |
|
|
|
* |
|
|
|
* @param applyNo 申请单号 |
|
|
|
* @param applyNo 试验单号 |
|
|
|
* @param processStep 工序名称 |
|
|
|
* @param roleType 角色类型(PROD/QA/TECH) |
|
|
|
* @return true=已确认, false=未确认 |
|
|
|
@ -459,7 +459,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
emailBody.append("<thead style='background-color: #4CAF50; color: white;'>"); |
|
|
|
emailBody.append("<tr>"); |
|
|
|
emailBody.append("<th>序号</th>"); |
|
|
|
emailBody.append("<th>申请单号</th>"); |
|
|
|
emailBody.append("<th>试验单号</th>"); |
|
|
|
emailBody.append("<th>事业部</th>"); |
|
|
|
emailBody.append("<th>试验名称</th>"); |
|
|
|
emailBody.append("<th>实验类型</th>"); |
|
|
|
@ -532,7 +532,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
emailBody.append("<thead style='background-color: #2196F3; color: white;'>"); |
|
|
|
emailBody.append("<tr>"); |
|
|
|
emailBody.append("<th>序号</th>"); |
|
|
|
emailBody.append("<th>申请单号</th>"); |
|
|
|
emailBody.append("<th>试验单号</th>"); |
|
|
|
emailBody.append("<th>事业部</th>"); |
|
|
|
emailBody.append("<th>试验名称</th>"); |
|
|
|
emailBody.append("<th>实验类型</th>"); |
|
|
|
@ -619,7 +619,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
emailBody.append("<thead style='background-color: #FF9800; color: white;'>"); |
|
|
|
emailBody.append("<tr>"); |
|
|
|
emailBody.append("<th>序号</th>"); |
|
|
|
emailBody.append("<th>申请单号</th>"); |
|
|
|
emailBody.append("<th>试验单号</th>"); |
|
|
|
emailBody.append("<th>事业部</th>"); |
|
|
|
emailBody.append("<th>工序名称</th>"); |
|
|
|
emailBody.append("<th>工序顺序</th>"); |
|
|
|
@ -1005,7 +1005,7 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic |
|
|
|
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>" |
|
|
|
|