diff --git a/src/main/java/org/upsmf/grievance/service/impl/DashboardServiceImpl.java b/src/main/java/org/upsmf/grievance/service/impl/DashboardServiceImpl.java index 5dfa0e9e035d5c48191fa4bfbb04489893c1f4ec..0c15a703b12254eacd1e4de61a0489029e77ae2f 100644 --- a/src/main/java/org/upsmf/grievance/service/impl/DashboardServiceImpl.java +++ b/src/main/java/org/upsmf/grievance/service/impl/DashboardServiceImpl.java @@ -286,7 +286,7 @@ public class DashboardServiceImpl implements DashboardService { // get total ticket count for provided filter and date range long totalTicketCount = getTotalTicketsCount(filter, date); // get total escalated ticket count - long totalEscalatedTicketCount = getEscalatedTicketsCount(filter, date, true); + long totalEscalatedTicketCount = getEscalatedTicketsCount(filter, date, true, null); // get total ticket nudged long totalNudgedTicketCount = getNudgedTicketsCount(filter, date); // get total ticket open greater than 21 days @@ -320,8 +320,11 @@ public class DashboardServiceImpl implements DashboardService { * @param isEscalated * @return */ - private long getEscalatedTicketsCount(Map<String, Object> filter, SearchDateRange date, boolean isEscalated) { + private long getEscalatedTicketsCount(Map<String, Object> filter, SearchDateRange date, boolean isEscalated, Boolean isOpen) { BoolQueryBuilder esQuery = createESQuery(filter, date); + if(isOpen != null && isOpen.booleanValue()) { + esQuery.must(QueryBuilders.matchQuery("status", "OPEN")); + } // adding condition to filter escalated ticket esQuery.must(QueryBuilders.matchQuery("is_escalated_to_admin", isEscalated)); return executeQueryForCount(esQuery); @@ -490,7 +493,7 @@ public class DashboardServiceImpl implements DashboardService { // get total ticket count for provided filter and date range long totalTicketCount = getTotalTicketsCount(filter, date); // get total escalated ticket count - long totalEscalatedTicketCount = getEscalatedTicketsCount(filter, date, true); + long totalEscalatedTicketCount = getEscalatedTicketsCount(filter, date, true, true); // get open ticket count long totalOpenTicketCount = getTicketCountByTicketStatus(filter, date, TicketStatus.OPEN); // get closed ticket count