From ef47e1efc236c5f4e2555542d6bb105280b2c32f Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 3 Apr 2026 09:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=AC=E5=8A=9E=E5=8E=BB=E6=8E=89=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=91=98=EF=BC=8C=E5=82=AC=E5=8A=9E=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8E=E4=B8=8B=E8=BE=BE=E6=97=B6=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ErfApprovalReminderServiceImpl.java  | 34 +++++++++++--------
 .../service/impl/ErfExpApplyServiceImpl.java  |  5 +--
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfApprovalReminderServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfApprovalReminderServiceImpl.java
index 322b55f3..e1cb7308 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfApprovalReminderServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfApprovalReminderServiceImpl.java
@@ -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>";
     }
 
diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
index 7284bcf1..8f67eb3d 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
@@ -910,9 +910,10 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
 
                     // 判断状态：如果两个都完成，则为completed；如果有一个在审批，则为current
                     boolean prodCompleted = prodInstance != null &&
-                        ("已批准".equals(prodInstance.getStatus()) || "已完成".equals(prodInstance.getStatus()));
+                        ("已批准".equals(prodInstance.getStatus()) || "已完成".equals(prodInstance.getStatus()) || "已跳过".equals(prodInstance.getStatus()));
                     boolean qualityCompleted = qualityInstance != null &&
-                        ("已批准".equals(qualityInstance.getStatus()) || "已完成".equals(qualityInstance.getStatus()));
+                        ("已批准".equals(qualityInstance.getStatus()) || "已完成".equals(qualityInstance.getStatus()) || "已跳过".equals(qualityInstance
+                                .getStatus()));
 
                     boolean prodRejected = prodInstance != null && "已驳回".equals(prodInstance.getStatus());
                     boolean qualityRejected = qualityInstance != null && "已驳回".equals(qualityInstance.getStatus());