diff --git a/monicar-control-center/src/main/java/org/controlcenter/alarm/infrastructure/jpa/AlarmJpaRepository.java b/monicar-control-center/src/main/java/org/controlcenter/alarm/infrastructure/jpa/AlarmJpaRepository.java index fd73a06..a8a0017 100644 --- a/monicar-control-center/src/main/java/org/controlcenter/alarm/infrastructure/jpa/AlarmJpaRepository.java +++ b/monicar-control-center/src/main/java/org/controlcenter/alarm/infrastructure/jpa/AlarmJpaRepository.java @@ -22,6 +22,7 @@ public interface AlarmJpaRepository extends JpaRepository { "LEFT JOIN manager m ON a.managerId = m.id " + "WHERE (:status IS NULL OR a.status = :status) " + " AND (:status IS NULL OR :status <> 'REQUIRED' OR a.managerId IS NULL) " + + " AND a.isChecked = FALSE " + "ORDER BY a.createdAt DESC") Page findAlarmListByStatus(@Param("status") AlarmStatus status, Pageable pageable); @@ -29,6 +30,7 @@ Page findAlarmListByStatus(@Param("status") AlarmStatus status, @Query("SELECT new org.controlcenter.alarm.domain.AlarmStatusStats(a.status, COUNT(a)) " + "FROM alarm a " + "WHERE a.deletedAt IS NULL " + + " AND a.isChecked = FALSE " + "GROUP BY a.status" ) List findStatusCounts();