Commit e3b525d3 authored by litengwei's avatar litengwei

bug 提交

parent 00d56e00
...@@ -1372,7 +1372,7 @@ ...@@ -1372,7 +1372,7 @@
<select id="fireAlarmLogPage" resultType="java.util.HashMap"> <select id="fireAlarmLogPage" resultType="java.util.HashMap">
SELECT SELECT
`wlesal`.id as alarmLogId, `wlesal`.id as alarmLogId,
`wesi`.equipment_index_name AS equipment_specific_index_name, `wesa`.equipment_specific_index_name,
`wlesal`.equipment_specific_name, `wlesal`.equipment_specific_name,
DATE_FORMAT(`wlesal`.`create_date`,'%m-%d %H:%i:%s') alarm_time, DATE_FORMAT(`wlesal`.`create_date`,'%m-%d %H:%i:%s') alarm_time,
wlesal.location, wlesal.location,
...@@ -1384,7 +1384,6 @@ ...@@ -1384,7 +1384,6 @@
`wl_equipment_specific_alarm_log` `wlesal` `wl_equipment_specific_alarm_log` `wlesal`
LEFT JOIN `wl_equipment_specific_alarm` wesa ON wesa.id = wlesal.equipment_specific_alarm_id LEFT JOIN `wl_equipment_specific_alarm` wesa ON wesa.id = wlesal.equipment_specific_alarm_id
LEFT JOIN `wl_equipment_specific` `wles` ON `wlesal`.`equipment_specific_id` = `wles`.`id` LEFT JOIN `wl_equipment_specific` `wles` ON `wlesal`.`equipment_specific_id` = `wles`.`id`
LEFT JOIN `wl_equipment_specific_index` `wesi` ON `wesi`.equipment_specific_id = `wles`.`id`
<where> <where>
wesa.`status` = 1 AND wlesal.clean_time IS NULL wesa.`status` = 1 AND wlesal.clean_time IS NULL
<if test="param.system != null and param.system != ''"> <if test="param.system != null and param.system != ''">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment