Commit 6574f8fd authored by Vijay Akula's avatar Vijay Akula

Changes to allocationchange page

parent 817dadbe
......@@ -17,9 +17,9 @@ public class AllocationChangeVO {
private String employeeName;
private String previousAccountName;
private String prevAccountName;
private String previousProjectName;
private String prevProjectName;
private String prevBillingStatus;
......
......@@ -23,6 +23,8 @@ public interface ResourceRepo
List<Resource> findByBillingStartDateGreaterThan(Date billingStartDate);
List<Resource> findByBillingStartDateBetween(Date fromDate,Date toDate);
// List<Resource> findByEmployeeIdAndActive(String employeeId, boolean status);
// List<Resource> findByEmployeeIdAndProjectIdAndActive(String employeeId, String projectId, boolean status);
......
......@@ -804,8 +804,12 @@ public class ResourceService implements IResourceService {
return resourceRepo.findByBillingStartDateGreaterThan(billingStartDate);
}
public List<Resource> getResourcesBetweenBillingStartDates(Date fromDate, Date toDate) {
return resourceRepo.findByBillingStartDateBetween(fromDate, toDate);
}
public List<AllocationChangeVO> getAllocationReports(Date fromDate, Date toDate) {
return prepareAllocationResources(getResourcesGreaterThanBillingStartDate(fromDate));
return prepareAllocationResources(getResourcesBetweenBillingStartDates(fromDate,toDate));
}
public List<AllocationChangeVO> prepareAllocationResources(List<Resource> resourcesList) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment