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-17 16:37:15 +07:00
parent a2a8aee819
commit bcf0c0bfdb
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1187,13 +1187,14 @@ namespace BMA.EHR.Application.Repositories.Commands
Seq = r.Sequence.ToString().ToThaiNumber(), Seq = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Organization = p.rootOld, Organization = p.rootOld,
OldPositionName = p.OrganizationPositionOld, OldOrganization = p.OrganizationOld,
OldPositionLevel = p.PositionLevelOld, OldPositionName = p.positionOld,
OldPositionLevel = p.PositionLevelOld == null ? "" : p.PositionLevelOld.ToThaiNumber(),
OldPositionNumber = p.PositionNumberOld == null ? null : p.PositionNumberOld.ToThaiNumber(), OldPositionNumber = p.PositionNumberOld == null ? null : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = p.root == null ? "" : p.root, NewOc = p.root == null ? "" : p.root,
NewPositionName = p.position == null ? "" : p.position, NewPositionName = p.position == null ? "" : p.position,
NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName, NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName.ToThaiNumber(),
// NewPositionType = p.posTypeName == null ? "" : p.posTypeName, // NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
NewPositionNumber = p.posMasterNo == null ? "" : NewPositionNumber = p.posMasterNo == null ? "" :
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() : p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :

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

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