From 54e04e19699cc5af56cbfd7e8395bbd8138d317a Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Mon, 21 Sep 2026 15:57:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=87=BA=E5=89=8D=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/NegativeTaskService.java          | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
index 8e24132..a5978e1 100644
--- a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
+++ b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
@@ -174,7 +174,7 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
                 }).collect(Collectors.joining("、"));
                 vo.setProblemTypeList(problemTypeList);
                 // 超时情况
-                vo.setHandleTimeout(getHandleTimeout(item.getHandleTimeout()));
+                vo.setHandleTimeout(getHandleTimeout(item));
                 // 办理时限
                 vo.setTimeLimit(TimeLimitEnum.getLabel(item.getTimeLimit()));
                 // 主办层级
@@ -334,24 +334,24 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
         vo.setLeadAgeAtCrtTime(TimeUtil.calcAgeFromIdCard(vo.getLeadIdCode(), crtDate));
     }
 
-    private String getHandleTimeout(Long time) {
+    private String getHandleTimeout(NegativeQueryVo item) {
+        boolean completed = ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus());
+        if (!completed) {
+            Long remainingDuration = item.getRemainingDuration();
+            if (remainingDuration == null) {
+                return "未开始计时";
+            }
+            if (remainingDuration < 0) {
+                return "已超时/超时" + TimeUtil.formatDuration(-remainingDuration);
+            }
+            return "未超时/剩余" + TimeUtil.formatDuration(remainingDuration);
+        }
+
+        Long time = item.getHandleTimeout();
         if (time == null || time <= 0) {
             return "未超时";
         }
-        // 秒
-        if (time < 60) {
-            return time + "秒";
-        }
-        // 分钟
-        if (time < 3600) {
-            return (int) Math.floor((double) time / 60) + "分" + (time % 60) + "秒";
-        }
-        // 小时
-        if (time < 86400) {
-            return String.format("%s时%s分", (int) Math.floor((double) time / 3600), time % 3600 / 60);
-        }
-        // 天
-        return String.format("%s天%s时", (int) Math.floor((double) time / 86400), time % 86400 / 3600);
+        return "办结超时/超时" + TimeUtil.formatDuration(time);
     }
 
     /**