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

filter retireresign

Browse source
This commit is contained in:
moss 2025-05-27 17:34:10 +07:00
parent 2f37334444
commit 28f8971e7f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -235,7 +235,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
} }
var retirementResigns = await _context.RetirementResigns.AsQueryable() var retirementResigns = await _context.RetirementResigns.AsQueryable()
.Where(x => x.Status == type.Trim().ToUpper()) .Where(x => type.Trim().ToUpper() == "APPROVE" ? (x.Status == "APPROVE" || x.Status == "REJECT") : x.Status == type.Trim().ToUpper())
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.Select(p => new .Select(p => new
{ {

2
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -174,7 +174,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
} }
var retirementResignEmployees = await _context.RetirementResignEmployees.AsQueryable() var retirementResignEmployees = await _context.RetirementResignEmployees.AsQueryable()
.Where(x => x.Status == type.Trim().ToUpper()) .Where(x => type.Trim().ToUpper() == "APPROVE" ? (x.Status == "APPROVE" || x.Status == "REJECT") : x.Status == type.Trim().ToUpper())
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.Select(p => new .Select(p => new
{ {