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

fix bug retirement
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
Bright 2025-03-24 18:01:59 +07:00
parent fcf76349f6
commit a7bf381d0a
2 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

36
BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
View file

@ -400,9 +400,43 @@ namespace BMA.EHR.Application.Repositories.Reports
p.RemarkHorizontal, p.RemarkHorizontal,
}) })
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (data == null)
data = await _dbContext.Set<RetirementResignEmployee>().AsQueryable()
.Where(x => x.Id == id)
.Select(p => new
{
p.Id,
p.prefix,
p.firstName,
p.lastName,
p.profileId,
p.Location,
p.SendDate,
p.ActiveDate,
p.Reason,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
p.RejectReason,
p.IsActive,
p.CreatedAt,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.OligarchReject,
p.OligarchApproveReason,
p.OligarchRejectReason,
p.OligarchRejectDate,
p.CommanderReject,
p.CommanderApproveReason,
p.CommanderRejectReason,
p.CommanderRejectDate,
p.RemarkHorizontal,
})
.FirstOrDefaultAsync();
if (data == null) if (data == null)
return null; return null;
var _data = new var _data = new
{ {
data.Id, data.Id,

3
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -149,7 +149,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsActive, p.IsActive,
}) })
.ToListAsync(); .ToListAsync();
if (status != null && status.Trim().ToUpper() != "WAITTING") //if (status != null && status.Trim().ToUpper() != "WAITTING")
if (status != null)
retirementOuts = retirementOuts.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); retirementOuts = retirementOuts.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
return Success(retirementOuts); return Success(retirementOuts);
} }