diff --git a/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/IRMasterDataService.java b/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/IRMasterDataService.java index d392c56..02c685a 100644 --- a/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/IRMasterDataService.java +++ b/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/IRMasterDataService.java @@ -19,4 +19,6 @@ public interface IRMasterDataService { int updateByIdAndEquType(String eqType, String refId); List deviceSubclassList(String equType); + + List BLQDeviceSubclassList(String equType); } diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/RMasterDataMapper.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/RMasterDataMapper.java index a11d4a4..7459307 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/RMasterDataMapper.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/RMasterDataMapper.java @@ -54,4 +54,6 @@ public interface RMasterDataMapper { int updateDlByIdAndEquType(@Param("eqType") String eqType, @Param("refId") String refId); List deviceSubclassList(@Param("equType") String equType); + + List BLQDeviceSubclassList(@Param("equType") String equType); } diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/RMasterDataMapping.xml b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/RMasterDataMapping.xml index 8eef084..a58a2b7 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/RMasterDataMapping.xml +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/RMasterDataMapping.xml @@ -258,4 +258,7 @@ + diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/LabReportBasisDataServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/LabReportBasisDataServiceImpl.java index 2e3583e..6ef9914 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/LabReportBasisDataServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/LabReportBasisDataServiceImpl.java @@ -536,7 +536,8 @@ public class LabReportBasisDataServiceImpl extends BaseDao deviceSubclassList(String equType) { - List deviceSubclassList = rMasterDataService.deviceSubclassList(equType); + List deviceSubclassList = null; + if (Objects.equals(equType, SiteConstants.ExternalTypeEnum.GIS.getValue()) || Objects.equals(equType, SiteConstants.ExternalTypeEnum.BYQ.getValue())) { + deviceSubclassList = rMasterDataService.deviceSubclassList(equType); + } else if (Objects.equals(equType, SiteConstants.ExternalTypeEnum.BLQ.getValue())) { + deviceSubclassList = rMasterDataService.BLQDeviceSubclassList(equType); + } return deviceSubclassList; } diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/RMasterDataServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/RMasterDataServiceImpl.java index 37db17c..e6ff495 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/RMasterDataServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/RMasterDataServiceImpl.java @@ -109,4 +109,8 @@ public class RMasterDataServiceImpl extends BaseDao impleme public List deviceSubclassList(String equType) { return rMasterDataMapper.deviceSubclassList(equType); } + + public List BLQDeviceSubclassList(String equType) { + return rMasterDataMapper.BLQDeviceSubclassList(equType); + } }