diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java index d527fc4..13398f0 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java @@ -132,4 +132,13 @@ public class ExportNegativeVo { @ExcelProperty({"","办理超时情况"}) private String handleTimeout; + + @ExcelProperty({"核办情况","分局审批时长"}) + private String secondApprovalTime; + + // 问题类型 + @ExcelProperty({"核办情况","市局审批时长"}) + private String firstApproveTime; + + } diff --git a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java index 068addd..21b5a8f 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java @@ -24,6 +24,7 @@ import com.biutag.supervision.pojo.vo.ExportNegativeBlameLeaderVo; import com.biutag.supervision.pojo.vo.ExportNegativeBlameVo; import com.biutag.supervision.pojo.vo.ExportNegativeVo; import com.biutag.supervision.pojo.vo.NegativeQueryVo; +import com.biutag.supervision.util.TimeUtil; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; @@ -204,6 +205,8 @@ public class NegativeTaskService extends ServiceImpl 0 表示剩余时间,diff < 0 表示超出时间 + if (diff >= 0) { + return "未超时/" + formatDuration(diff); + } else { + return "已超时/" + formatDuration(-diff); + } + } + }