diff --git a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java index bedd006..681d595 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java @@ -180,15 +180,14 @@ public class NegativeQueryService { queryWrapper.orderByDesc(Negative::getUpdTime); Page page = negativeService.page(Page.of(param.getCurrent(), param.getSize()), queryWrapper); long l = System.currentTimeMillis(); -// List list = page.getRecords().stream().map(item -> { -// NegativeQueryVo vo = new NegativeQueryVo(); -// BeanUtils.copyProperties(item, vo); -// if (Objects.nonNull(item.getFirstDistributeTime()) && !ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())) { -// vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey())); -// } -// return vo; -// }).toList(); - List list = new ArrayList<>(); + List list = page.getRecords().stream().map(item -> { + NegativeQueryVo vo = new NegativeQueryVo(); + BeanUtils.copyProperties(item, vo); + if (Objects.nonNull(item.getFirstDistributeTime()) && !ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())) { + vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey())); + } + return vo; + }).toList(); System.out.printf("耗时:%sms", System.currentTimeMillis() - l); return new Page().setRecords(list).setTotal(page.getTotal()); }