调整告警统计接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -2112,6 +2112,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Override
     public List<Map<String, Object>> getSystemAlarmInfoList(String startDate, String endDate) {
+        if (!StringUtil.isNotEmpty(startDate)) {
+            startDate = null;
+        }
+        if (!StringUtil.isNotEmpty(endDate)) {
+            endDate = null;
+        }
         return fireFightingSystemMapper.getSystemAlarmInfoList(startDate, endDate);
     }
 

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

@@ -5296,7 +5296,7 @@
         FROM
         `f_fire_fighting_system` `fs`
         where
-            fs.system_type_code IS NOT NULL
+            fs.system_type_code IS NOT NULL AND LENGTH(trim(fs.system_type_code)) != 0 AND fs.system_type_code != 'otherSys'
     </select>
 
     <select id="getSystemCountInfo" resultType="java.util.Map">