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

api แต่งตั้งลูกจ้าง

Browse source
This commit is contained in:
Kittapath 2023-10-03 08:58:30 +07:00
parent 15054de97f
commit 4b9c3a2bc7
7 changed files with 576 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
View file

@ -328,6 +328,7 @@ namespace BMA.EHR.Application.Repositories.Commands
OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(),
// OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
OldSalaryDate = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Date.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"),
NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name,
NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name,

1
BMA.EHR.Application/Responses/Reports/CommandType03Response.cs
View file

@ -40,5 +40,6 @@ namespace BMA.EHR.Application.Responses.Reports
public string? Reason { get; set; } = string.Empty;
public string? LeaveDate { get; set; } = string.Empty;
public string? MilitaryDate { get; set; } = string.Empty;
public string? OldSalaryDate { get; set; } = string.Empty;
}
}