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

Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
moss 2025-03-27 15:58:33 +07:00
commit 3542906e41
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -217,7 +217,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
.Include(x => x.Type)
.Where(x => x.LeaveStatus != "DRAFT")
.OrderByDescending(x => x.CreatedAt.Date)
.OrderByDescending(x => x.CreatedAt)
.AsQueryable();
if (year != 0)

2
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -1379,7 +1379,7 @@ namespace BMA.EHR.Leave.Service.Controllers
LeaveTypeName = item.Type.Name,
FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
ProfileType = item.ProfileType ?? "-",
DateSendLeave = item.CreatedAt.Date,
DateSendLeave = item.CreatedAt,
Status = item.LeaveStatus,
CitizenId = item.CitizenId ?? "",
LeaveStartDate = item.LeaveStartDate,