From 820d7496e78355492feddaa54c969af6af36919b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sun, 25 Feb 2024 17:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=A7=8BBOM-=E5=8F=8D=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/ReverseReport/OriginalBomQuery.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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<ReverseReportVO> reportResult = new ArrayList<>();
 
     private RedisService redisService = SpringUtil.getBean(RedisService.class);
@@ -43,12 +43,13 @@ public class OriginalBomQuery {
     }
 
 
-    public void report() {
+    public List<ReverseReportVO> 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<ReverseReportVO> drawingParents = parentList.stream().filter(u -> u.getChildDrawingNo().equals(k)).collect(Collectors.toList());
                 Map<String, List<ReverseReportVO>> 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<String> dawNos = parentList.stream().map(u -> u.getDrawingNo()).distinct().collect(Collectors.toList());
             multipleLevelReport(dawNos);
-        }
-        else {
+        } else {
             resultMap.forEach((k, v) -> {
                 reportResult.addAll(v);
             });