|
@@ -13,8 +13,8 @@
|
|
|
<result column="modifier" property="modifier"/>
|
|
|
<result column="modified_time" property="modifiedTime"/>
|
|
|
<collection property="relListItemList" ofType="com.persagy.apm.alarmservice.project.alarmruleobjrel.model.vo.ProjectAlarmRuleObjRelVO">
|
|
|
- <result column="equip_id" property="equipId"/>
|
|
|
- <result column="equip_name" property="equipName"/>
|
|
|
+ <result column="obj_id" property="equipId"/>
|
|
|
+ <result column="obj_name" property="equipName"/>
|
|
|
<result column="open" property="open"/>
|
|
|
</collection>
|
|
|
</resultMap>
|
|
@@ -26,7 +26,7 @@
|
|
|
where a.group_id = #{groupId}
|
|
|
and a.alarm_item_code = #{alarmItemCode}
|
|
|
<if test="equipName != null and equipName != ''">
|
|
|
- and b.equip_name like '%${equipName}%'
|
|
|
+ and b.obj_name like '%${equipName}%'
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="queryList" resultMap="ProjectAlarmRuleMap">
|
|
@@ -40,15 +40,15 @@
|
|
|
a.creation_time,
|
|
|
a.modified_time,
|
|
|
a.modifier,
|
|
|
- b.equip_id,
|
|
|
- b.equip_name,
|
|
|
+ b.obj_id,
|
|
|
+ b.obj_name,
|
|
|
b.open
|
|
|
from project_alarm_rule a
|
|
|
left join project_alarm_rule_obj_rel b on a.id = b.project_alarm_rule_id
|
|
|
where a.group_id = #{groupId}
|
|
|
and a.alarm_item_code = #{alarmItemCode}
|
|
|
<if test="equipName != null and equipName != ''">
|
|
|
- and b.equip_name like '%${equipName}%'
|
|
|
+ and b.obj_name like '%${equipName}%'
|
|
|
</if>
|
|
|
order by a.creation_time
|
|
|
limit #{startIndex},#{size}
|