feat:实验数据新增避雷器设备小类查询

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<DeviceSubclassOrTestItemListVo> deviceSubclassList(String equType);
+
+    List<DeviceSubclassOrTestItemListVo> BLQDeviceSubclassList(String equType);
 }

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<DeviceSubclassOrTestItemListVo> deviceSubclassList(@Param("equType") String equType);
+
+    List<DeviceSubclassOrTestItemListVo> BLQDeviceSubclassList(@Param("equType") String equType);
 }

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/RMasterDataMapping.xml

@@ -258,4 +258,7 @@
     <select id="deviceSubclassList" resultType="com.huatek.busi.vo.DeviceSubclassOrTestItemListVo">
 		select id,sheet_name as value from x_r_master_data where deleted = 0 and equipment_type = #{equType} group by sheet_name
 	</select>
+	<select id="BLQDeviceSubclassList" resultType="com.huatek.busi.vo.DeviceSubclassOrTestItemListVo">
+		select distinct sheet_name as value from x_r_arrester_data where deleted = 0 and equipment_type = #{equType}
+	</select>
 </mapper>

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/LabReportBasisDataServiceImpl.java

@@ -536,7 +536,8 @@ public class              LabReportBasisDataServiceImpl extends BaseDao<LabRepor
                 }
 
                 BusiSiteTreeVo equipmentInfo = null;
-                if (Objects.equals(eqType, SiteConstants.ExternalTypeEnum.GIS.getValue()) || Objects.equals(eqType, SiteConstants.ExternalTypeEnum.CW.getValue())) {
+                if (Objects.equals(eqType, SiteConstants.ExternalTypeEnum.GIS.getValue()) || Objects.equals(eqType, SiteConstants.ExternalTypeEnum.CW.getValue())
+                   || Objects.equals(eqType, SiteConstants.ExternalTypeEnum.BLQ.getValue()) ) {
                     equipmentInfo = labReportBasisDataMapper.findGisInfo(equipmentId, jgId);
                 } else {
                     equipmentInfo = labReportBasisDataMapper.findByqInfo(equipmentId);
@@ -2188,7 +2189,12 @@ public class              LabReportBasisDataServiceImpl extends BaseDao<LabRepor
 
     @Override
     public List<DeviceSubclassOrTestItemListVo> deviceSubclassList(String equType) {
-        List<DeviceSubclassOrTestItemListVo> deviceSubclassList = rMasterDataService.deviceSubclassList(equType);
+        List<DeviceSubclassOrTestItemListVo> 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;
     }
 

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/RMasterDataServiceImpl.java

@@ -109,4 +109,8 @@ public class RMasterDataServiceImpl extends BaseDao<RMasterData, String> impleme
     public List<DeviceSubclassOrTestItemListVo> deviceSubclassList(String equType) {
         return rMasterDataMapper.deviceSubclassList(equType);
     }
+
+    public List<DeviceSubclassOrTestItemListVo> BLQDeviceSubclassList(String equType) {
+        return rMasterDataMapper.BLQDeviceSubclassList(equType);
+    }
 }