feat: 导出前后端保持一致

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) {
-        if (time == null || time <= 0) {
+        boolean completed = ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus());
-            return "未超时";
+        if (!completed) {
+            Long remainingDuration = item.getRemainingDuration();
+            if (remainingDuration == null) {
+                return "未开始计时";
             }
-        // 秒
+            if (remainingDuration < 0) {
-        if (time < 60) {
+                return "已超时/超时" + TimeUtil.formatDuration(-remainingDuration);
-            return time + "秒";
             }
-        // 分钟
+            return "未超时/剩余" + TimeUtil.formatDuration(remainingDuration);
-        if (time < 3600) {
-            return (int) Math.floor((double) time / 60) + "分" + (time % 60) + "秒";
         }
-        // 小时
+
-        if (time < 86400) {
+        Long time = item.getHandleTimeout();
-            return String.format("%s时%s分", (int) Math.floor((double) time / 3600), time % 3600 / 60);
+        if (time == null || time <= 0) {
+            return "未超时";
         }
-        // 天
+        return "办结超时/超时" + TimeUtil.formatDuration(time);
-        return String.format("%s天%s时", (int) Math.floor((double) time / 86400), time % 86400 / 3600);
     }
 
     /**