MT -5 Changes deployed

src/main/java/com/nisum/myteam/controller/ReportsController.java

@@ -345,8 +345,7 @@ public class ReportsController {
  //         float traineePer;
             float billper;
             float nonBillPer;
-            List<Employee> employeeList = employeeService.getAllEmployees().stream().
-                    filter(e -> e.getFunctionalGroup().equals(functionalGroup)).collect(Collectors.toList());
+            List<Employee> employeeList = employeeService.getEmployeesByFunctionalGrp(functionalGroup);
             for(Employee employee:employeeList){
                 Resource resource = resourceService.getLatestResourceByEmpId(employee.getEmployeeId());
                 if(resource!=null && resource.getBillableStatus().equals("Billable")){

src/main/java/com/nisum/myteam/service/impl/ResourceService.java

@@ -843,9 +843,8 @@ public class ResourceService implements IResourceService {
         return allocationList;
     }
     @Override
-	public Set<Resource> findByBillableStatus(String billableStatus) {
-    	List<String> uniqueEmployeeIds=new ArrayList<>();
-		return resourceRepo.findByBillableStatus(billableStatus).stream().filter(e->!uniqueEmployeeIds.contains(e.getEmployeeId())).map(e->{uniqueEmployeeIds.add(e.getEmployeeId()); return e;}).collect(Collectors.toSet());
+	public Set<Resource> findByBillableStatus(String billableStatus) {    	
+		return resourceRepo.findByBillableStatus(billableStatus).stream().filter(r -> r.getBillingEndDate().after(new Date())).collect(Collectors.toSet());
 	}