Merge remote-tracking branch 'origin/develop_station' into develop_station

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -1256,7 +1256,7 @@
 			xhsanhj,
 			xhsangz,
 			xhsanpb,
-			xhszc,
+			(xhszc - noZcTotal) AS xhszc,
 			xhsan
 		FROM
 			(
@@ -1313,58 +1313,56 @@
 							OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
 							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
     </select>
     <select id="fireWaterSysCollectingDevice" resultType="java.util.Map">
         SELECT
             sbfcjzzyc,
             sbfcjzzbs,
-			sbfcjzzzc,
+            ( sbfcjzzzc - noZcTotal ) AS sbfcjzzzc,
             sbfcjzz
         FROM
             (
             SELECT
+                ( SELECT count( 1 ) FROM `wl_equipment_specific_index` s WHERE s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' AND s.`value` = 'true' ) AS sbfcjzzyc,
+                ( SELECT count( 1 ) FROM `wl_equipment_specific_index` s WHERE s.equipment_index_key = 'FHS_CollectingDevice_DeviceLock' AND s.`value` = 'true' ) AS sbfcjzzbs,
                 (
                 SELECT
-							count(1)
+                    count( DISTINCT equipment_specific_id )
                 FROM
                     `wl_equipment_specific_index` s
                 WHERE
-							s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
-						AND s.`value` = 'true'
-					) AS sbfcjzzyc,
-					(
-						SELECT
-							count(1)
-						FROM
-							`wl_equipment_specific_index` s
-						WHERE
-							s.equipment_index_key = 'FHS_CollectingDevice_DeviceLock'
-						AND s.`value` = 'true'
-					) AS sbfcjzzbs,
-					(
-						SELECT
-							count(1)
-						FROM
-							`wl_equipment_specific_index` si
-						WHERE
-							si.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
+                    ( s.`value` = 'false' OR s.`value` IS NULL )
+                    AND ( s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' )
                 ) AS sbfcjzz,
                 (
                 SELECT
-							count(
-								DISTINCT equipment_specific_id
-							)
+                    count( DISTINCT equipment_specific_id )
                 FROM
                     `wl_equipment_specific_index` s
                 WHERE
-							(
-								s.`value` = 'false'
-								OR s.`value` IS NULL
-							)
+                    ( s.`value` = 'false' OR s.`value` IS NULL )
                     AND s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
-					) AS sbfcjzzzc
+                ) AS sbfcjzzzc,
+            ( SELECT count( DISTINCT equipment_specific_id ) FROM `wl_equipment_specific_index` s WHERE ( s.`value` = 'true' ) AND s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' ) AS noZcTotal
             ) AS collectingDevice
     </select>
     <select id="fireWaterSysWaterPump" resultType="java.util.Map">