diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/domain/TbBdRecord.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/domain/TbBdRecord.java
index 1147174..978211c 100644
--- a/bonus-modules/base/src/main/java/com/bonus/base/basic/domain/TbBdRecord.java
+++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/domain/TbBdRecord.java
@@ -149,6 +149,11 @@ public class TbBdRecord implements Serializable {
*/
private Integer bdTotal;
+ /**
+ * 杆塔id
+ */
+ private Long powerId;
+
/**
* 边带设备记录
*/
diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml
index e55d9b1..b1d6c5f 100644
--- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml
+++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml
@@ -59,6 +59,9 @@
area_name,
+
+ power_id,
+
dev_user,
@@ -85,6 +88,9 @@
#{areaName},
+
+ #{powerId},
+
#{devUser},
@@ -251,15 +257,19 @@
b.audit_status = 1
and b.pro_name like concat('%',#{proName},'%')
+ and b.pro_name NOT LIKE '%_%' ESCAPE '/'
and b.depart_name like concat('%',#{departName},'%')
+ and b.depart_name NOT LIKE '%_%' ESCAPE '/'
and a.dev_name like concat('%',#{devName},'%')
+ and a.dev_name NOT LIKE '%_%' ESCAPE '/'
and a.dev_code like concat('%',#{devCode},'%')
+ and a.dev_code NOT LIKE '%_%' ESCAPE '/'
diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml
index 1aef86d..8b0807d 100644
--- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml
+++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml
@@ -82,10 +82,12 @@
select
tbdr.id as id, tbdr.record_id as recordId, tbdr.dev_name as devName, tbdr.dev_code as devCode, tbdr.unit_name as unitName, tbdr.area_name as areaName,
tbdr.dev_user as devUser, tbdr.dev_user_phone as devUserPhone,
- tbr.audit_user as auditUser, tbr.audit_time as auditTime, su.nick_name as auditUserName
+ tbr.audit_user as auditUser, tbr.audit_time as auditTime, su.nick_name as auditUserName,
+ tbdr.power_id as powerId, tpp.gt_name as powerName
from tb_bd_device_record tbdr
left join tb_bd_record tbr on tbdr.record_id = tbr.id
left join sys_user su on tbr.audit_user = su.user_id
+ left join tb_pro_power tpp on tbdr.power_id = tpp.id
where tbdr.record_id = #{id}