Commit ff99be05 authored by maoying's avatar maoying

修改实时告警页面sql

parent 1142b3c7
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
WHEN 'false' THEN '否' WHEN 'false' THEN '否'
ELSE ind.value END 'e_value', ELSE ind.value END 'e_value',
ein.unit as eq_point_unit, ein.unit as eq_point_unit,
sce.name as source_name, str.full_name as source_name,
( (
SELECT SELECT
group_concat(DISTINCT f.`name`) group_concat(DISTINCT f.`name`)
...@@ -181,12 +181,11 @@ ...@@ -181,12 +181,11 @@
left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id
left join wl_equipment_detail as det on spe.equipment_detail_id = det.id left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
left join wl_equipment_index as ein on ind.equipment_index_id = ein.id left join wl_equipment_index as ein on ind.equipment_index_id = ein.id
left join wl_stock_detail as sto on sto.qr_code = spe.qr_code left join wl_stock_detail as sto on sto.equipment_specific_id = spe.id
left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.id left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.id
left join f_risk_source as sce on str.source_id = sce.id
) d ) d
WHERE WHERE
1 = 1 e_value IS NOT NULL AND e_value != ''
<if test="fireEquipmentName!=null"> <if test="fireEquipmentName!=null">
AND d.fireEquipmentName LIKE '%${fireEquipmentName}%' AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
</if> </if>
...@@ -196,7 +195,6 @@ ...@@ -196,7 +195,6 @@
<if test="startTime!=null"> <if test="startTime!=null">
AND d.create_date BETWEEN '${startTime}' AND '${endTime}' AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
</if> </if>
AND e_value IS NOT NULL AND e_value != ''
ORDER BY d.create_date desc ORDER BY d.create_date desc
LIMIT ${start},${length} LIMIT ${start},${length}
</select> </select>
......
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