updated reports sending active employee by account

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

@@ -478,4 +478,9 @@ public class EmployeeService implements IEmployeeService {
 
     }
 
+	public Employee findByEmployeeIdAndEmpStatus(String active, String employeeId) {
+		// TODO Auto-generated method stub
+		return employeeRepo.findByEmployeeIdAndEmpStatus(employeeId, active);
+	}
+
 }

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

@@ -10,6 +10,7 @@ import com.nisum.myteam.model.vo.ReportVo;
 import com.nisum.myteam.model.vo.ResourceVO;
 import com.nisum.myteam.service.IReportService;
 import com.nisum.myteam.statuscodes.ResourceStatus;
+import com.nisum.myteam.utils.MyTeamUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -119,7 +120,11 @@ public class ReportService implements IReportService {
         List<Project> projects = projectService.getProjectsByAccountId(accountService.getAccountByName(accountName).getAccountId());
         projects.stream().forEach(p -> {
         resourceService.getResourceByProjectId(p.getProjectId()).stream().filter(r -> r.getBillingEndDate().after(new Date())).
-                forEach(r ->employeeList.add(employeeService.getEmployeeById(r.getEmployeeId())));
+                forEach(r ->{
+                	Employee employee= employeeService.findByEmployeeIdAndEmpStatus(MyTeamUtils.ACTIVE,r.getEmployeeId());
+                	if(employee!=null)
+                			employeeList.add(employeeService.getEmployeeById(r.getEmployeeId()));
+                }); 
         });
         return employeeList;
     }