diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java index 6504a09e..06dd24d5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java @@ -31,7 +31,7 @@ public class OriginalBomQuery { /** * 报表结果 */ - @Getter + private List reportResult = new ArrayList<>(); private RedisService redisService = SpringUtil.getBean(RedisService.class); @@ -43,12 +43,13 @@ public class OriginalBomQuery { } - public void report() { + public List report() { if (queryParam.getQueryType().equals(ReportConstant.QueryTypeEnum.SINGLE.getValue())) { singleLevelReport(); } else { multipleLevelReport(ImmutableList.of(queryParam.getDrawingNo())); } + return reportResult; } /** @@ -74,8 +75,8 @@ public class OriginalBomQuery { drawingNos.forEach(k -> { List drawingParents = parentList.stream().filter(u -> u.getChildDrawingNo().equals(k)).collect(Collectors.toList()); Map> nMap = ListCommonUtil.listGroupMap(drawingParents, ReverseReportVO::getDrawingNo); - nMap.keySet().forEach(u->{ - if(resultMap.containsKey(k)) { + nMap.keySet().forEach(u -> { + if (resultMap.containsKey(k)) { nMap.get(u).addAll(resultMap.get(k)); } resultMap.put(u, nMap.get(u)); @@ -84,8 +85,7 @@ public class OriginalBomQuery { }); List dawNos = parentList.stream().map(u -> u.getDrawingNo()).distinct().collect(Collectors.toList()); multipleLevelReport(dawNos); - } - else { + } else { resultMap.forEach((k, v) -> { reportResult.addAll(v); });