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, "错误的查询方式"); } } 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;