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

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

@@ -4923,7 +4923,7 @@
         IFNULL( rp.output_flow_rate, 0 ) AS outputFlowRate,
 --         IFNULL(max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.`value` END ),'--')  AS nowLevel,
         IFNULL((select
-        avg(IFNULL(ei.`value`, 0))
+        avg(ei.`value`)
         from
         wl_equipment_specific_index ei
         where
@@ -4978,7 +4978,7 @@
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
         IFNULL( rp.output_flow_rate, 0 ) AS outputFlowRate,
         (select
-        avg(IFNULL(ei.`value`,0))
+        avg(ei.`value`)
         from
         wl_equipment_specific_index ei
         where
@@ -6998,7 +6998,7 @@
             *
         FROM
             (
-                (SELECT count( DISTINCT wei.name_key ) AS indexNum FROM wl_equipment_index wei WHERE wei.is_iot = 1) AS indexNum,
+                (SELECT count( 1 ) FROM wl_equipment_specific_index a LEFT JOIN wl_equipment_index b ON a.equipment_index_id = b.id WHERE b.is_iot = 1) AS indexNum,
                 (SELECT count( 1 ) AS equipNum FROM wl_equipment_specific es LEFT JOIN wl_equipment e ON e.`code` = es.equipment_code WHERE e.is_iot = 1
                     <if test="bizOrgCode!=null and bizOrgCode!=''">
                         AND es.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')