修改bug

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

@@ -1391,7 +1391,7 @@
                             ) fireAlarm ON (((
                                                      date_format( `fireAlarm`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
                                                  )
-                                AND ( `fireAlarm`.`equipment_specific_index_name` = '火警' )
+                                AND ( `fireAlarm`.`type` = 'FIREALARM' )
                                 )))
                     GROUP BY
                         `weekUtil`.`click_date`
@@ -1420,7 +1420,7 @@
                                 </where>
                             ) `breakdown` ON (((
                                                        `weekUtil`.`click_date` = date_format( `breakdown`.`create_date`, '%Y-%m-%d' ))
-                                AND ( `breakdown`.`equipment_specific_index_name` = '故障' ))))
+                                AND ( `breakdown`.`type` = 'BREAKDOWN' ))))
                     GROUP BY
                         `weekUtil`.`click_date`
                     ORDER BY
@@ -1449,7 +1449,7 @@
                             ) `shield` ON (((
                                                     date_format( `shield`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
                                                 )
-                                AND ( `shield`.`equipment_specific_index_name` = '屏蔽' ))))
+                                AND ( `shield`.`type` = 'SHIELD' ))))
                     GROUP BY
                         `weekUtil`.`click_date`
                     ORDER BY
@@ -1479,7 +1479,7 @@
                                                    date_format( `other`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
                                                )
                                 AND (
-                                               `other`.`equipment_specific_index_name` NOT IN ( '火警', '故障', '屏蔽' )))))
+                                               `other`.`equipment_specific_index_name` NOT IN ( 'SHIELD', 'BREAKDOWN', 'FIREALARM' )))))
                     GROUP BY
                         `weekUtil`.`click_date`
                     ORDER BY

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

@@ -4640,7 +4640,7 @@
         )
         END
         ) AS levelAbs,
-        a.nowLevel,
+        IFNULL( a.nowLevel, '--' ) nowLevel,
         (
         CASE