From cc110419e7ef80549d5a9f84366ab2510787ce31 Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 15 Mar 2024 14:33:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=94=B9=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/api/user/BomReportApi.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 9fe01bc0..2797892f 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 @@ -75,9 +75,9 @@ 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.getQueryType().compareTo(ReportConstant.QueryTypeEnum.SINGLE.getValue()) == 0 + || query.getQueryType().compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) == 0 + || query.getQueryType().compareTo(ReportConstant.QueryTypeEnum.SUM.getValue()) == 0)) { return ResultVO.error(STATE.ParamErr, "错误的查询方式"); } } From 0a4e5d4d3924b8215eac5717500d8149c3c2f6b1 Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 15 Mar 2024 14:44:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?+=E7=89=88=E6=9C=AC=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/domain/EBom/EBomForwardReport.java | 1 + .../product/bomnew/service/domain/PBom/PBomForwardReport.java | 1 + 2 files changed, 2 insertions(+) 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 7abcd25e..2e8124ed 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 @@ -165,6 +165,7 @@ public class EBomForwardReport extends BaseForwardReport { list) { ReportBomVersionVO.QueryBomVersionVO versionVO = new ReportBomVersionVO.QueryBomVersionVO(); versionVO.setVersion(entity.getCurrentVersion()); + versionVO.setVersionDesc(entity.getCurrentVersion()); reportBomVersionVO.getVList().add(versionVO); } return reportBomVersionVO; 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 00392ecd..bb6ee2f9 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 @@ -177,6 +177,7 @@ public class PBomForwardReport extends BaseForwardReport { list) { ReportBomVersionVO.QueryBomVersionVO versionVO = new ReportBomVersionVO.QueryBomVersionVO(); versionVO.setVersion(entity.getCurrentVersion()); + versionVO.setVersionDesc(entity.getCurrentVersion()); reportBomVersionVO.getVList().add(versionVO); } return reportBomVersionVO;