From f7818bd6fae243abaf88d5367a34d55dd6f0422c Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 30 Jul 2024 18:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/pojo/vo/ReportBomVO.java | 3 +++ .../service/domain/EBom/EBomForwardReport.java | 12 +++++++----- .../service/domain/PBom/PBomForwardReport.java | 11 +++++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReportBomVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReportBomVO.java index 86b92e6c..4fd6ca68 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReportBomVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReportBomVO.java @@ -14,6 +14,9 @@ public class ReportBomVO { private List childNodes; + @ApiModelProperty("bom版本数量") + private Integer bomNum; + @ApiModelProperty("BOM 类型 0-原始BOM 1-EBom 2-PBom 3-MBom") private Integer bomType; @ApiModelProperty("查询方式 0-单层 1-多层 2-汇总") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java index fd1b5616..0890d399 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java @@ -311,7 +311,9 @@ public class EBomForwardReport extends BaseForwardReport { } - return buildReportBomVo(forwardReportVO, nodesList); + ReportBomVO reportBomVO= buildReportBomVo(forwardReportVO, nodesList); + reportBomVO.setBomNum(listParent.size()); + return reportBomVO; } @@ -484,9 +486,9 @@ public class EBomForwardReport extends BaseForwardReport { nodesList.addAll(nodeList); } - return buildReportBomVo(forwardReportVO, nodesList, query.getDataType()); - - + ReportBomVO reportBomVO= buildReportBomVo(forwardReportVO, nodesList, query.getDataType()); + reportBomVO.setBomNum(listParent.size()); + return reportBomVO; } @@ -531,7 +533,7 @@ public class EBomForwardReport extends BaseForwardReport { multiReportObj.getChildNodes().clear(); multiReportObj.getChildNodes().addAll(nodesList); - + multiReportObj.setBomNum(bomVesionMap.size()); return multiReportObj; // List listParent = getParentV2(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java index 4bc082f3..3126e17e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java @@ -328,7 +328,9 @@ public class PBomForwardReport extends BaseForwardReport { nodesList.addAll(nodeList); } - return buildReportBomVo(forwardReportVO,nodesList); + ReportBomVO reportBomVO= buildReportBomVo(forwardReportVO,nodesList); + reportBomVO.setBomNum(listParent.size()); + return reportBomVO; } @@ -515,8 +517,9 @@ public class PBomForwardReport extends BaseForwardReport { nodesList.addAll(nodeList); } - return buildReportBomVo(forwardReportVO,nodesList,query.getDataType()); - + ReportBomVO reportBomVO =buildReportBomVo(forwardReportVO,nodesList,query.getDataType()); + reportBomVO.setBomNum(listParent.size()); + return reportBomVO; } /** @@ -557,7 +560,7 @@ public class PBomForwardReport extends BaseForwardReport { multiReportObj.getChildNodes().clear(); multiReportObj.getChildNodes().addAll(nodesList); - + multiReportObj.setBomNum(bomVesionMap.size()); return multiReportObj;