"UIReport Service implemented"

src/main/java/com/nisum/myteam/model/BillableEmployee.java

+package com.nisum.myteam.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class BillableEmployee implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	
+	private String employeeId;
+	private String employeeName;
+	private String emailId;
+	private String projectName;
+	private String billableStatus;
+	private Date billingStartDate;
+	private Date billingEndDate;
+	private String functionalGroup;
+	
+}

src/main/java/com/nisum/myteam/service/IEmployeeService.java

-package com.nisum.myteam.service;
-
-import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.dao.Account;
-import com.nisum.myteam.model.dao.Employee;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-@Service
-public interface IEmployeeService {
-
-    boolean isEmployeeExistsById(String employeeId);
-
-    Employee createEmployee(Employee employeeRoles, String empId) throws MyTeamException;
-
-    Employee updateEmployee(Employee employeeRoles, String empId);
-
-    Employee deleteEmployee(String empId);
-
-    Employee updateProfile(Employee employeeRoles) throws MyTeamException;
-
-    Employee getEmployeeById(String empId);
-
-    Employee getEmployeeByEmaillId(String emailId);
-
-    List<Employee> getManagers() throws MyTeamException;
-
-    List<Employee> getActiveEmployees() throws MyTeamException;
-
-    List<Employee> getEmployeesByStatus(String status);
-
-    List<Account> getAccounts() throws MyTeamException;
-
-    Employee getEmployeeRoleDataForSearchCriteria(String searchId, String searchAttribute);
-
-    List<String> getEmployeeDetailsForAutocomplete();
-
-    List<HashMap<String, String>> getDeliveryLeads(String domainId);
-
-    List<Employee> getEmployeesByFunctionalGrp(String functionalGrp);
-
-    boolean verifyEmployeeRole(String empId, String roleName);
-
-    List<Employee> getEmployeesFromList(Set<String> empIdsSet);
-
-    List<HashMap<String, String>> getDeliveryManagerMap(List deliveryManagerIdsList);
-
-    public List<Employee> getAllEmployees();
-
-    public List<Employee> getEmployeesByEmpStatusAndShift(String empStatus, String shift);
-
-}
+package com.nisum.myteam.service;
+
+import com.nisum.myteam.exception.handler.MyTeamException;
+import com.nisum.myteam.model.BillableEmployee;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Employee;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+@Service
+public interface IEmployeeService {
+
+    boolean isEmployeeExistsById(String employeeId);
+
+    Employee createEmployee(Employee employeeRoles, String empId) throws MyTeamException;
+
+    Employee updateEmployee(Employee employeeRoles, String empId);
+
+    Employee deleteEmployee(String empId);
+
+    Employee updateProfile(Employee employeeRoles) throws MyTeamException;
+
+    Employee getEmployeeById(String empId);
+
+    Employee getEmployeeByEmaillId(String emailId);
+
+    List<Employee> getManagers() throws MyTeamException;
+
+    List<Employee> getActiveEmployees() throws MyTeamException;
+
+    List<Employee> getEmployeesByStatus(String status);
+
+    List<Account> getAccounts() throws MyTeamException;
+
+    Employee getEmployeeRoleDataForSearchCriteria(String searchId, String searchAttribute);
+
+    List<String> getEmployeeDetailsForAutocomplete();
+
+    List<HashMap<String, String>> getDeliveryLeads(String domainId);
+
+    List<Employee> getEmployeesByFunctionalGrp(String functionalGrp);
+
+    boolean verifyEmployeeRole(String empId, String roleName);
+
+    List<Employee> getEmployeesFromList(Set<String> empIdsSet);
+
+    List<HashMap<String, String>> getDeliveryManagerMap(List deliveryManagerIdsList);
+
+    public List<Employee> getAllEmployees();
+
+    public List<Employee> getEmployeesByEmpStatusAndShift(String empStatus, String shift);
+
+	List<BillableEmployee> getEmployeeDetailsByFGAndBillability(String fGroup, String billableStatus);
+
+}

src/main/java/com/nisum/myteam/service/IResourceService.java

-package com.nisum.myteam.service;
-
-import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.dao.Employee;
-import com.nisum.myteam.model.dao.Resource;
-import com.nisum.myteam.model.vo.EmployeeShiftsVO;
-import com.nisum.myteam.model.vo.MyProjectAllocationVO;
-import com.nisum.myteam.model.vo.ReserveReportsVO;
-import com.nisum.myteam.model.vo.ResourceVO;
-
-import java.util.Date;
-import java.util.List;
-
-public interface IResourceService {
-
-
-    Resource addResource(Resource resourceAllocation, String loginEmpId) throws MyTeamException;
-
-    public void updateExistedResource(Resource resourceAlloc) throws MyTeamException;
-
-    public void insertNewResourceWithNewStatus(Resource resourceAllocReq, String loginEmpId) throws MyTeamException;
-
-    void deleteResource(Resource resource, String loginEmpId);
-
-    List<Resource> getAllResourcesForAllActiveProjects();
-
-    List<Resource> getResourcesSortByBillingStartDate(String employeeId);
-
-    List<ResourceVO> getActiveResources(String empId);
-
-
-    public List<ResourceVO> getResourcesForProject(String projectId, String statusFlag);
-
-    public List<Resource> getResourcesUnderDeliveryLead(String empId);
-
-
-    public List<ResourceVO> getBillingsForEmployee(String empId);
-
-
-    public List<Resource> getBillingsForProject(String empId, String projectId);
-
-
-    public List<MyProjectAllocationVO> getWorkedProjectsForResource(String empId);
-
-
-    public List<Employee> getUnAssignedEmployees();
-
-    public List<Resource> getAllResources();
-
-    public List<ResourceVO> getAllResourcesVO();
-
-    public void deleteResourcesUnderProject(String projectId);
-
-    public Resource addResourceToBenchProject(Employee employee, String loginEmpId) throws MyTeamException;
-
-
-    public List<EmployeeShiftsVO> getResourcesForShift(String shift);
-
-    public Resource getLatestResourceByEmpId(String employeeId);
-
-    public List<Resource> getResourcesByBillingStatus(String resourceStatus);
-
-    public List<ReserveReportsVO> prepareReserveReports(List<Resource> resourcesList);
-
-    public List<ReserveReportsVO> getResourceReportsByBillingStatus(String resourceStatus);
-
-
-    // List<Resource> getAllResourcesForProject(String projectId, String status);
-
-    //  List<Resource> getResourcesForEmployee(String empId);
-
-    // List<Resource> getAllResourcesForProject(String projectId);
-
-    // Resource save(Resource resource);
-
-    //  void addResources(Employee employee, String loginEmpId);
-
-    // void inactivateResource(Employee employeeReq, Employee employeeUpdated, String loginEmpId);
-
-}
+package com.nisum.myteam.service;
+
+import com.nisum.myteam.exception.handler.MyTeamException;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.Resource;
+import com.nisum.myteam.model.vo.EmployeeShiftsVO;
+import com.nisum.myteam.model.vo.MyProjectAllocationVO;
+import com.nisum.myteam.model.vo.ReserveReportsVO;
+import com.nisum.myteam.model.vo.ResourceVO;
+
+import java.util.Date;
+import java.util.List;
+
+public interface IResourceService {
+
+
+    Resource addResource(Resource resourceAllocation, String loginEmpId) throws MyTeamException;
+
+    public void updateExistedResource(Resource resourceAlloc) throws MyTeamException;
+
+    public void insertNewResourceWithNewStatus(Resource resourceAllocReq, String loginEmpId) throws MyTeamException;
+
+    void deleteResource(Resource resource, String loginEmpId);
+
+    List<Resource> getAllResourcesForAllActiveProjects();
+
+    List<Resource> getResourcesSortByBillingStartDate(String employeeId);
+
+    List<ResourceVO> getActiveResources(String empId);
+
+
+    public List<ResourceVO> getResourcesForProject(String projectId, String statusFlag);
+
+    public List<Resource> getResourcesUnderDeliveryLead(String empId);
+
+
+    public List<ResourceVO> getBillingsForEmployee(String empId);
+
+
+    public List<Resource> getBillingsForProject(String empId, String projectId);
+
+
+    public List<MyProjectAllocationVO> getWorkedProjectsForResource(String empId);
+
+
+    public List<Employee> getUnAssignedEmployees();
+
+    public List<Resource> getAllResources();
+
+    public List<ResourceVO> getAllResourcesVO();
+
+    public void deleteResourcesUnderProject(String projectId);
+
+    public Resource addResourceToBenchProject(Employee employee, String loginEmpId) throws MyTeamException;
+
+
+    public List<EmployeeShiftsVO> getResourcesForShift(String shift);
+
+    public Resource getLatestResourceByEmpId(String employeeId);
+
+    public List<Resource> getResourcesByBillingStatus(String resourceStatus);
+
+    public List<ReserveReportsVO> prepareReserveReports(List<Resource> resourcesList);
+
+    public List<ReserveReportsVO> getResourceReportsByBillingStatus(String resourceStatus);
+
+	List<Resource> findByBillableStatus(String billableStatus);
+
+
+    // List<Resource> getAllResourcesForProject(String projectId, String status);
+
+    //  List<Resource> getResourcesForEmployee(String empId);
+
+    // List<Resource> getAllResourcesForProject(String projectId);
+
+    // Resource save(Resource resource);
+
+    //  void addResources(Employee employee, String loginEmpId);
+
+    // void inactivateResource(Employee employeeReq, Employee employeeUpdated, String loginEmpId);
+
+}