Commit 6d0f6199 authored by 高建强's avatar 高建强

item:【装备】修改消防水系统->消火栓按钮正常统计

parent f98791b9
...@@ -1256,7 +1256,7 @@ ...@@ -1256,7 +1256,7 @@
xhsanhj, xhsanhj,
xhsangz, xhsangz,
xhsanpb, xhsanpb,
xhszc, (xhszc - noZcTotal) AS xhszc,
xhsan xhsan
FROM FROM
( (
...@@ -1313,7 +1313,24 @@ ...@@ -1313,7 +1313,24 @@
OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault' OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
OR s.equipment_index_key = 'FAS_FireHydrantButton_Shield' OR s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
) )
) AS xhszc ) AS xhszc,
(
SELECT
count(
DISTINCT equipment_specific_id
)
FROM
`wl_equipment_specific_index` s
WHERE
(
s.`value` = 'true'
)
AND (
s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
OR s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
)
) AS noZcTotal
) AS hydrant ) AS hydrant
</select> </select>
<select id="fireWaterSysCollectingDevice" resultType="java.util.Map"> <select id="fireWaterSysCollectingDevice" resultType="java.util.Map">
......
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