1.应急中评增加统计项

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AlertStatisticsMapper.xml

@@ -153,8 +153,8 @@
     </select>
     <select id="countEmergencyEventsByOrgCodeAndDate2" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
         SELECT
-        ifnull (SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0) AS total as longValue,
-        alarm_type_code as keyStr,
+        ifnull (SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0) AS longValue,
+        alarm_type_code as keyStr
         FROM
         tz_alert_called
         WHERE

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -407,13 +407,13 @@ public class YJDPStatisticsServiceImpl {
         // 杂物电梯(台)
         result.put("zhdtCount", equDefineNumMap.getOrDefault("3430",0L));
         // 应急事件(起)
-        result.put("alarmCount", alertTypeNumMap.get(DispatchPaperEnums.KRJY.getId()) + alertTypeNumMap.get(DispatchPaperEnums.GZWX.getId()));
+        result.put("alarmCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.KRJY.getId(),0L) + alertTypeNumMap.getOrDefault(DispatchPaperEnums.GZWX.getId(), 0L));
         // 困人救援事件(起)
-        result.put("krjysjCount", alertTypeNumMap.get(DispatchPaperEnums.KRJY.getId()));
+        result.put("krjysjCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.KRJY.getId(),0L));
         // 故障维修(起)
-        result.put("gzwxCount", alertTypeNumMap.get(DispatchPaperEnums.GZWX.getId()));
+        result.put("gzwxCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.GZWX.getId(),0L));
         // 投诉咨询(起)
-        result.put("tszxCount", alertTypeNumMap.get(DispatchPaperEnums.TSZX.getId()));
+        result.put("tszxCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.TSZX.getId(),0L));
         // 解救被困乘客数(人)
         result.put("jjbkcksCount", alertStatisticsMapper.countRescuedPersonNum(orgCode,filterParamDto));
         return result;