From 304e73479d64b69082681b82ee125a99d0ab6ca6 Mon Sep 17 00:00:00 2001 From: jing's Date: Wed, 21 Feb 2024 14:02:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/api/user/BomReportApi.java | 30 +++++++++---------- .../domain/EBom/EBomForwardReport.java | 1 + .../domain/PBom/PBomForwardReport.java | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java index 6def7ea6..5159986c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java @@ -48,10 +48,10 @@ public class BomReportApi extends BaseApi { if (Objects.isNull(query.getBomType())) { return ResultVO.error(STATE.ParamErr, "请选择BOM类型"); } else { - if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) != 0 - || query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) != 0 - || query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) != 0 - || query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) != 0) { + if ( !(query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) == 0 + || query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) == 0 + || query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) == 0 + || query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) == 0)) { return ResultVO.error(STATE.ParamErr, "错误的BOM类型"); } @@ -62,19 +62,19 @@ public class BomReportApi extends BaseApi { if (Objects.isNull(query.getQueryType())) { return ResultVO.error(STATE.ParamErr, "请选择查询方式"); } else { - if (query.getBomType().compareTo(ReportConstant.QueryTypeEnum.SINGLE.getValue()) != 0 - || query.getBomType().compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) != 0 - || query.getBomType().compareTo(ReportConstant.QueryTypeEnum.SUM.getValue()) != 0) { + if (!(query.getBomType().compareTo(ReportConstant.QueryTypeEnum.SINGLE.getValue()) == 0 + || query.getBomType().compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) == 0 + || query.getBomType().compareTo(ReportConstant.QueryTypeEnum.SUM.getValue()) == 0)) { return ResultVO.error(STATE.ParamErr, "错误的查询方式"); } } - if (Objects.isNull(query.getBomVersion())) { + if (Objects.isNull(query.getVersionStrategy())) { return ResultVO.error(STATE.ParamErr, "请选择版本策略"); } else { - if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) != 0 - || query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.ALL.getValue()) != 0 - || query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue()) != 0) { + if (!(query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) == 0 + || query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.ALL.getValue()) == 0 + || query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue()) == 0)) { return ResultVO.error(STATE.ParamErr, "错误的版本策略"); } } @@ -101,10 +101,10 @@ public class BomReportApi extends BaseApi { if (Objects.isNull(query.getBomType())) { return ResultVO.error(STATE.ParamErr, "请选择BOM类型"); } else { - if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) != 0 - || query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) != 0 - || query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) != 0 - || query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) != 0) { + if (!(query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) == 0 + || query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) == 0 + || query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) == 0 + || query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) == 0)) { return ResultVO.error(STATE.ParamErr, "错误的BOM类型"); } 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 e3da796e..63fda868 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 @@ -119,6 +119,7 @@ public class EBomForwardReport extends BaseForwardReport { for (ForwardReportVO vo : nodeList) { vo.setCreatedTime(forwardReportVO.getCreatedTime()); + vo.setLevelNum(1); // vo.setOrderNumber(""); } 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 4aa71023..3460af80 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 @@ -127,7 +127,7 @@ public class PBomForwardReport extends BaseForwardReport { for (ForwardReportVO vo : nodeList) { vo.setCreatedTime(forwardReportVO.getCreatedTime()); - + vo.setLevelNum(1); } }