Commit 6f0e41a9 authored by tangwei's avatar tangwei

修改bug

parent f054a45c
...@@ -4134,12 +4134,11 @@ ...@@ -4134,12 +4134,11 @@
LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids ) LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids )
LEFT JOIN wl_equipment_specific spec on report.equipment_specific_id = spec.id LEFT JOIN wl_equipment_specific spec on report.equipment_specific_id = spec.id
where report.system_ids is not null and report.index_true_num > 0 where report.system_ids is not null and report.index_true_num > 0
and( report.index_type LIKE CONCAT('%','Fault','%')
or report.index_type LIKE CONCAT('%','FireAlarm','%') <foreach collection="indicator" item="index" open="AND(" separator="or" close=")">
or report.index_type LIKE CONCAT('%','Shield','%') report.index_type like concat ('%', #{index})
or report.index_type LIKE CONCAT('%','Open','%') </foreach>
or report.index_type LIKE CONCAT('%','OilLeak','%')
or report.index_type LIKE CONCAT('%','Alarm','%'))
and report.report_date BETWEEN #{startDate} and #{endDate} and report.report_date BETWEEN #{startDate} and #{endDate}
and system_id = #{systemId} and system_id = #{systemId}
and index_type = #{indexType} and index_type = #{indexType}
......
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