Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

@@ -4116,7 +4116,7 @@
     </select>
     <select id="selectAlarms" resultType="java.lang.Integer">
         SELECT
-        COUNT(1)
+            SUM(index_true_num)
         FROM
         wl_equipment_alarm_report_day report
         LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids )
@@ -4449,7 +4449,9 @@
         LEFT JOIN wl_equipment_detail detail ON spec.equipment_detail_id = detail.id
         LEFT JOIN wl_equipment equipment ON equipment.id =detail.equipment_id
         left join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id)
-        where spec.system_id = #{systemId} AND equipment.is_iot = 1
+        where
+        FIND_IN_SET(#{systemId},spec.system_id)
+         AND equipment.is_iot = 1
         GROUP BY code,s.id, name ORDER BY system_id, code ) a) as  a1
         GROUP BY a1.system_id
         ) as b
@@ -5628,7 +5630,7 @@
             <if test="systemCode != null and systemCode != ''">
                 AND fs.system_type_code = #{systemCode}
             </if>
-        GROUP BY det.`code`
+        GROUP BY wle.`code`
     </select>
 
     <select id="getFireSystemEquipStatusList" resultType="java.util.Map">