From 7b3148a62051513764bfabdf1247f82947d89b41 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Mon, 15 Jun 2026 18:35:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=BC=E5=85=A5=E7=9A=84=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E5=8A=A0=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/NegativeTaskService.java          |  4 +--
 .../com/biutag/supervision/util/TimeUtil.java | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
index 231a584..827f689 100644
--- a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
+++ b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
@@ -225,8 +225,8 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
                     fillBlameAndLeaderAges(blameVo);
                     blameVoList.add(blameVo);
                 }
-                vo.setFirstApproveTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getFirstApproveTime())));
-                vo.setSecondApprovalTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getSecondApprovalTime())));
+                vo.setFirstApproveTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getFirstApproveTime()), "city", true));
+                vo.setSecondApprovalTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getSecondApprovalTime()), "branch", true));
                 return vo;
             }).toList();
         }
diff --git a/src/main/java/com/biutag/supervision/util/TimeUtil.java b/src/main/java/com/biutag/supervision/util/TimeUtil.java
index e6f4a22..b43b948 100644
--- a/src/main/java/com/biutag/supervision/util/TimeUtil.java
+++ b/src/main/java/com/biutag/supervision/util/TimeUtil.java
@@ -259,4 +259,33 @@ public class TimeUtil {
         }
     }
 
+    /**
+     * 判断指定审批时长是否超时（按审批层级阈值）
+     * @param usedSeconds 已用审批时长（秒）
+     * @param dictValue 审批超时字典值，branch=分局审批，city=市局审批
+     * @return 未超时/已超时
+     */
+    public static String getTimeoutStatus(long usedSeconds, String dictValue) {
+        return getTimeoutStatus(usedSeconds, dictValue, false);
+    }
+
+    /**
+     * 判断指定审批时长是否超时（按审批层级阈值）
+     * @param usedSeconds 已用审批时长（秒）
+     * @param dictValue 审批超时字典值，branch=分局审批，city=市局审批
+     * @param detail 是否展示超时明细
+     * @return 未超时，或 已超时/超时xx天xx时xx分
+     */
+    public static String getTimeoutStatus(long usedSeconds, String dictValue, boolean detail) {
+        Long threshold = getApprovalLockThreshold(dictValue);
+        long diff = threshold - usedSeconds;
+        if (diff >= 0) {
+            return "未超时";
+        }
+        if (detail) {
+            return "已超时/超时" + formatDuration(-diff);
+        }
+        return "已超时";
+    }
+
 }