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

no message

Browse source
This commit is contained in:
kittapath 2024-11-12 10:53:38 +07:00
parent ddb541c819
commit 560cdae209
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
View file

@ -998,7 +998,7 @@ namespace BMA.EHR.Application.Repositories.Reports
.ToListAsync(); .ToListAsync();
foreach (var insigniaPeriod in insigniaPeriods) foreach (var insigniaPeriod in insigniaPeriods)
{ {
if (insigniaPeriod.EndDate.Date.AddDays(5) == DateTime.Now.Date) if (insigniaPeriod.EndDate.Date.AddDays(5) < DateTime.Now.Date)
continue; continue;
insigniaPeriod.IsLock = true; insigniaPeriod.IsLock = true;
var insigniaNote = await _dbContext.Set<InsigniaNote>() var insigniaNote = await _dbContext.Set<InsigniaNote>()

8
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -719,10 +719,10 @@ namespace BMA.EHR.Placement.Service.Controllers
.Include(x => x.OrganizationPosition) .Include(x => x.OrganizationPosition)
.Include(x => x.PositionNumber) .Include(x => x.PositionNumber)
.Include(x => x.PositionPath) .Include(x => x.PositionPath)
.Include(x => x.PositionLevel) // .Include(x => x.PositionLevel)
.Include(x => x.PositionLine) .Include(x => x.PositionLine)
.Include(x => x.PositionPathSide) .Include(x => x.PositionPathSide)
.Include(x => x.PositionType) // .Include(x => x.PositionType)
.FirstOrDefaultAsync(x => x.Id == req.PersonalId); .FirstOrDefaultAsync(x => x.Id == req.PersonalId);
if (person == null) if (person == null)
return Error(GlobalMessages.DataNotFound, 404); return Error(GlobalMessages.DataNotFound, 404);
@ -1246,10 +1246,10 @@ namespace BMA.EHR.Placement.Service.Controllers
.Include(x => x.OrganizationPosition) .Include(x => x.OrganizationPosition)
.Include(x => x.PositionNumber) .Include(x => x.PositionNumber)
.Include(x => x.PositionPath) .Include(x => x.PositionPath)
.Include(x => x.PositionLevel) // .Include(x => x.PositionLevel)
.Include(x => x.PositionLine) .Include(x => x.PositionLine)
.Include(x => x.PositionPathSide) .Include(x => x.PositionPathSide)
.Include(x => x.PositionType) // .Include(x => x.PositionType)
.FirstOrDefaultAsync(x => x.Id == personalId); .FirstOrDefaultAsync(x => x.Id == personalId);
if (profile == null) if (profile == null)
return Error(GlobalMessages.DataNotFound, 404); return Error(GlobalMessages.DataNotFound, 404);