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

no message

Browse source
This commit is contained in:
Kittapath 2024-06-18 13:54:19 +07:00
parent a89b8e0453
commit bb87b8f809
4 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1598,12 +1598,12 @@ namespace BMA.EHR.Application.Repositories.Commands
LastName = d.lastName,
RefPlacementProfileId = d.id,
RefDisciplineId = d.id,
Organization = d.Organization,
PositionName = d.PositionName,
PositionLevel = d.PositionLevel,
PositionType = d.PositionType,
PositionNumber = d.PositionNumber,
BirthDate = d.BirthDate,
Organization = d.organization,
PositionName = d.positionName,
PositionLevel = d.positionLevel,
PositionType = d.positionType,
PositionNumber = d.positionNumber,
BirthDate = d.birthDate,
};
seq++;
@ -7526,15 +7526,14 @@ namespace BMA.EHR.Application.Repositories.Commands
{
var data = command.Receivers.Select(x => new
{
PersonId = x.RefPlacementProfileId,
Id = x.RefDisciplineId,
TemplateDoc = "คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}",
Amount = x.Amount,
PositionSalaryAmount = x.PositionSalaryAmount,
MouthSalaryAmount = x.MouthSalaryAmount,
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
personId = x.RefPlacementProfileId.ToString(),
id = x.RefDisciplineId.ToString(),
templateDoc = "คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}",
amount = x.Amount,
positionSalaryAmount = x.PositionSalaryAmount,
mouthSalaryAmount = x.MouthSalaryAmount,
refCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
});
var baseAPI = _configuration["API"];
var apiUrl = $"{baseAPI}/org/profile-employee/report/resume";
using (var client = new HttpClient())
@ -11135,7 +11134,13 @@ namespace BMA.EHR.Application.Repositories.Commands
RefDisciplineId = item.RefDisciplineId,
Amount = salary == null ? 0 : salary.SalaryAmount,
MouthSalaryAmount = salary == null ? 0 : salary.MonthSalaryAmount,
PositionSalaryAmount = salary == null ? 0 : salary.PositionSalaryAmount
PositionSalaryAmount = salary == null ? 0 : salary.PositionSalaryAmount,
Organization = item.Organization,
PositionName = item.PositionName,
PositionLevel = item.PositionLevel,
PositionType = item.PositionType,
PositionNumber = item.PositionNumber,
BirthDate = item.BirthDate,
};
seq++;