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

fix ออกคำสั่งย้ายลูกจ้างประจำ

Browse source
This commit is contained in:
Bright 2024-07-16 16:19:11 +07:00
parent 1960f243d0
commit a2a8aee819
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1320,7 +1320,8 @@ namespace BMA.EHR.Application.Repositories.Commands
Seq = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Organization = p.OrganizationPositionOld,
OldPositionName = p.OrganizationPositionOld,
OldOrganization = p.OrganizationOld,
OldPositionName = p.positionOld,
OldPositionLevel = p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? null : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),

2
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -7078,7 +7078,7 @@ namespace BMA.EHR.Application.Repositories.Commands
}
var baseAPIOrg = _configuration["API"];
var apiUrlOrg = $"{baseAPIOrg}/org/pos/report/current";
var apiUrlOrg = $"{baseAPIOrg}/org/employee/pos/report/current";
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));

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

@ -6,6 +6,7 @@
// public string CitizenId { get; set; } = string.Empty;
public string? FullName { get; set; } = string.Empty;
public string? Organization { get; set; } = string.Empty;
public string? OldOrganization { get; set; } = string.Empty;
public string? OldPositionName { get; set; } = string.Empty;
public string? OldPositionLevel { get; set; } = string.Empty;
public string? OldPositionNumber { get; set; } = string.Empty;