diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs index 42645db8..db3b8c3a 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs @@ -628,9 +628,13 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests public async Task> GetSumSendLeaveAsync(int year) { + var startFiscalDate = new DateTime(year - 1, 10, 1); + var endFiscalDate = new DateTime(year, 9, 30); + var data = await _dbContext.Set().AsQueryable().AsNoTracking() .Include(x => x.Type) - .Where(x => x.LeaveStartDate.Year == year) + //.Where(x => x.LeaveStartDate.Year == year) + .Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate ) .Where(x => x.LeaveStatus == "NEW") // fix issue : #729 .ToListAsync(); @@ -650,9 +654,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests public async Task> GetSumApproveLeaveAsync(int year) { + // fix issue : #729 + var startFiscalDate = new DateTime(year - 1, 10, 1); + var endFiscalDate = new DateTime(year, 9, 30); + var data = await _dbContext.Set().AsQueryable().AsNoTracking() .Include(x => x.Type) - .Where(x => x.LeaveStartDate.Year == year) + //.Where(x => x.LeaveStartDate.Year == year) + .Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate) // fix issue : #729 .Where(x => x.LeaveStatus == "APPROVE") .ToListAsync(); @@ -672,9 +681,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests public async Task> GetSumRejectLeaveAsync(int year) { + // fix issue : #729 + var startFiscalDate = new DateTime(year - 1, 10, 1); + var endFiscalDate = new DateTime(year, 9, 30); + var data = await _dbContext.Set().AsQueryable().AsNoTracking() .Include(x => x.Type) - .Where(x => x.LeaveStartDate.Year == year) + //.Where(x => x.LeaveStartDate.Year == year) + .Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate) // fix issue : #729 .Where(x => x.LeaveStatus == "REJECT") .ToListAsync(); @@ -694,9 +708,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests public async Task> GetSumDeleteLeaveAsync(int year) { + // fix issue : #729 + var startFiscalDate = new DateTime(year - 1, 10, 1); + var endFiscalDate = new DateTime(year, 9, 30); + var data = await _dbContext.Set().AsQueryable().AsNoTracking() .Include(x => x.Type) - .Where(x => x.LeaveStartDate.Year == year) + //.Where(x => x.LeaveStartDate.Year == year) + .Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate) // fix issue : #729 .Where(x => x.LeaveStatus == "DELETE") .ToListAsync();