diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java index 2d7af8a..5e62c68 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java @@ -120,6 +120,8 @@ public class BasedataPatrolPoint extends BaseEntity { private String pointTypeName; private String pointTypeCode; + private String parentName; + public void setPatrolpointName(String patrolpointName) { this.patrolpointName = patrolpointName; this.patrolPointName = patrolpointName; diff --git a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml index ab28bf8..4dc90b2 100644 --- a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml @@ -746,7 +746,7 @@ a.patrol_point_id, (SELECT c.device_name FROM basedata_device c WHERE c.device_id = b.parent_id) parent_name, b.device_name, - a.patrolpoint_name, + a.patrol_point_name, a.alarm_threshold, a.alg_subtype_ids, IFNULL(a.update_time, a.create_time) AS update_time @@ -759,7 +759,7 @@ AND a.alarm_threshold != '[]' AND ( a.alarm_threshold LIKE '%52%' OR a.alarm_threshold LIKE '%53%' ) and b.device_name = #{deviceName} - and a.patrolpoint_name = #{patrolPointName} + and a.patrol_point_name = #{patrolPointName} ORDER BY a.device_id