From 965f9cff8a0b15d3a29967e7b02cc2a7eb3e6da1 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 10 Dec 2024 11:00:25 +0700 Subject: [PATCH] =?UTF-8?q?fix=20issue=20:=20729=20=E0=B9=80=E0=B8=9B?= =?UTF-8?q?=E0=B8=A5=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=99=E0=B9=80=E0=B8=8A?= =?UTF-8?q?=E0=B9=87=E0=B8=84=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B9=80=E0=B8=A3?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=A5=E0=B8=B2=E0=B8=95=E0=B8=B2?= =?UTF-8?q?=E0=B8=A1=E0=B8=9B=E0=B8=B5=20=E0=B9=80=E0=B8=9B=E0=B9=89?= =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=A3=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=83?= =?UTF-8?q?=E0=B8=99=E0=B8=8A=E0=B9=88=E0=B8=A7=E0=B8=87=E0=B8=9B=E0=B8=B5?= =?UTF-8?q?=E0=B8=87=E0=B8=9A=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A1=E0=B8=B2?= =?UTF-8?q?=E0=B8=93=20=E0=B9=80=E0=B8=8A=E0=B9=88=E0=B8=99=2067=20=3D=201?= =?UTF-8?q?/10/66=20-=2030/9/67?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LeaveRequests/LeaveRequestRepository.cs | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) 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();