hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' into adiDev
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source 
# Conflicts:
#	BMA.EHR.Leave/Controllers/LeaveReportController.cs
This commit is contained in:
AdisakKanthawilang 2025-03-11 17:39:58 +07:00
commit dc8a3dc39c
5 changed files with 248 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserDutyTimeRepository.cs
View file

@ -62,7 +62,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
{
var data = _dbContext.Set<UserDutyTime>()
.Where(u => !u.IsProcess)
.Where(u => u.EffectiveDate.Value.Date <= DateTime.Now.Date)
.Where(u => u.EffectiveDate.Value.Date <= DateTime.Now.AddHours(7).Date)
.ToList();
foreach (var d in data)
@ -106,6 +106,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
var data = await _dbContext.Set<UserDutyTime>()
.Where(x => x.ProfileId == profileId)
.Where(x => x.IsProcess)
.Where(x => x.EffectiveDate.Value.Date <= DateTime.Now.Date)
.OrderByDescending(x => x.EffectiveDate)
.FirstOrDefaultAsync();