|
@@ -45,7 +45,7 @@ rt.type_desc, rt.tenant_id, rt.alarm_status </sql>
|
|
|
<include refid="Base_Column_List"/>,ifnull(rule.numberOfWaterMeters,0)numberOfWaterMeters
|
|
|
,CONCAT_ws("/",e.name,b.product_model,b.product_name) product_name,c.name categoryName
|
|
|
from rmcp_alarm_type rt left join (select count(*) numberOfWaterMeters,alarm_type_id
|
|
|
- from rmcp_device_alarm_rule group by alarm_type_id ) rule on rt.id=rule.alarm_type_id
|
|
|
+ from rmcp_device_alarm_rule where status=1 group by alarm_type_id ) rule on rt.id=rule.alarm_type_id
|
|
|
join rmcp_product b on rt.device_type_id=b.id
|
|
|
join rmcp_product_category c on rt.product_categroy_id=c.id
|
|
|
join rmcp_manufacturer e on b.manufacturer_id=e.id
|