From d142a7f90a568249901c23ff561d8e14fb7e1aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= <guocheng@xinyingpower.com>
Date: Thu, 13 Mar 2025 15:27:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=9E=E9=AA=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=81=BF=E9=9B=B7=E5=99=A8=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=B0=8F=E7=B1=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/huatek/busi/service/IRMasterDataService.java   |  2 ++
 .../java/com/huatek/busi/mapper/RMasterDataMapper.java |  2 ++
 .../com/huatek/busi/mapping/RMasterDataMapping.xml     |  3 +++
 .../service/impl/LabReportBasisDataServiceImpl.java    | 10 ++++++++--
 .../busi/service/impl/RMasterDataServiceImpl.java      |  4 ++++
 5 files changed, 19 insertions(+), 2 deletions(-)

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<DeviceSubclassOrTestItemListVo> deviceSubclassList(String equType);
+
+    List<DeviceSubclassOrTestItemListVo> 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<DeviceSubclassOrTestItemListVo> deviceSubclassList(@Param("equType") String equType);
+
+    List<DeviceSubclassOrTestItemListVo> 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 @@
     <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>
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<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;
     }
 
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<RMasterData, String> impleme
     public List<DeviceSubclassOrTestItemListVo> deviceSubclassList(String equType) {
         return rMasterDataMapper.deviceSubclassList(equType);
     }
+
+    public List<DeviceSubclassOrTestItemListVo> BLQDeviceSubclassList(String equType) {
+        return rMasterDataMapper.BLQDeviceSubclassList(equType);
+    }
 }