Merge remote-tracking branch 'origin/master'

src/main/java/com/biutag/supervision/service/NegativeQueryService.java

@@ -180,15 +180,14 @@ public class NegativeQueryService {
         queryWrapper.orderByDesc(Negative::getUpdTime);
         Page<Negative> page = negativeService.page(Page.of(param.getCurrent(), param.getSize()), queryWrapper);
         long l = System.currentTimeMillis();
-//        List<NegativeQueryVo> list = page.getRecords().stream().map(item -> {
+        List<NegativeQueryVo> list = page.getRecords().stream().map(item -> {
-//            NegativeQueryVo vo = new NegativeQueryVo();
+            NegativeQueryVo vo = new NegativeQueryVo();
-//            BeanUtils.copyProperties(item, vo);
+            BeanUtils.copyProperties(item, vo);
-//            if (Objects.nonNull(item.getFirstDistributeTime()) && !ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())) {
+            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()));
+                vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey()));
-//            }
+            }
-//            return vo;
+            return vo;
-//        }).toList();
+        }).toList();
-        List<NegativeQueryVo> list = new ArrayList<>();
         System.out.printf("耗时：%sms", System.currentTimeMillis() - l);
         return new Page<NegativeQueryVo>().setRecords(list).setTotal(page.getTotal());
     }