合并分支 'master' 到 'dev'

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/ConfirmCheckServiceImpl.java

@@ -311,19 +311,19 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
     public Page<CheckStatTableVo> findAllStatTable(CheckBillSelectVo checkBillSelectVo) {
         //过滤出顶级节点
         List<TaskBto> topStatList = taskService.findBillType(7);
-        List<TaskBto> topDetailList = taskService.findBillType(8);
-        topStatList.addAll(topDetailList);
+//        List<TaskBto> topDetailList = taskService.findBillType(8);
+//        topStatList.addAll(topDetailList);
 
-//        List<Integer> topIdList = topStatList.stream()
-//                .filter(taskBto -> taskBto.getParentTaskId().equals(0) || taskBto.getParentTaskId() == null)
-//                .map(TaskBto::getBillId)
-//                .collect(toList());
+        List<Integer> topIdList = topStatList.stream()
+                .filter(taskBto -> taskBto.getParentTaskId().equals(0) || taskBto.getParentTaskId() == null)
+                .map(TaskBto::getBillId)
+                .collect(toList());
 
         List<CheckStatTableVo> tableVos = statDao.findAll(checkBillSelectVo.getPageable().getSort()).stream()
                 .filter(deviceCheckStat -> !"[]".equals(deviceCheckStat.getStatInfo()))
                 .map(objTransUtil::stat2TableVo)
                 .filter(vo -> keywordFilter(vo, checkBillSelectVo.getKeyword()))
-//                .filter(v->topIdList.contains(v.getId()))
+                .filter(v->topIdList.contains(v.getId()))
                 .filter(v1->unitIdFilter(v1,checkBillSelectVo.getUnitId()))
                 .collect(Collectors.toList());