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

12
BMA.EHR.Application/Responses/PassSalaryResponse.cs
View file

@ -18,11 +18,11 @@
// public Guid? commandId { get; set; } = Guid.Empty; // public Guid? commandId { get; set; } = Guid.Empty;
public DateTime? BirthDate { get; set; } public DateTime? birthDate { get; set; }
public string? Organization { get; set; } public string? organization { get; set; }
public string? PositionName { get; set; } public string? positionName { get; set; }
public string? PositionLevel { get; set; } public string? positionLevel { get; set; }
public string? PositionType { get; set; } public string? positionType { get; set; }
public string? PositionNumber { get; set; } public string? positionNumber { get; set; }
} }
} }

8
BMA.EHR.Command.Service/Controllers/OrderController.cs
View file

@ -4571,7 +4571,13 @@ namespace BMA.EHR.Command.Service.Controllers
IdCard = r.CitizenId, IdCard = r.CitizenId,
Name = $"{r.Prefix}{r.FirstName} {r.LastName}", Name = $"{r.Prefix}{r.FirstName} {r.LastName}",
SelectStatus = r.RefPlacementProfileId == null ? false : (existed.FirstOrDefault(x => x.RefPlacementProfileId!.Value == r.RefPlacementProfileId!.Value) != null), SelectStatus = r.RefPlacementProfileId == null ? false : (existed.FirstOrDefault(x => x.RefPlacementProfileId!.Value == r.RefPlacementProfileId!.Value) != null),
Education = "" // ยังหาไม่เจอว่าอยุ่ field ไหน Education = "", // ยังหาไม่เจอว่าอยุ่ field ไหน
Organization = r.Organization == null ? null : r.Organization,
PositionName = r.PositionName == null ? null : r.PositionName,
PositionLevel = r.PositionLevel == null ? null : r.PositionLevel,
PositionType = r.PositionType == null ? null : r.PositionType,
PositionNumber = r.PositionNumber == null ? null : r.PositionNumber,
BirthDate = r.BirthDate == null ? null : r.BirthDate,
}).ToList(); }).ToList();
// ให้ Update Salary เฉพาะของ Command 01-04 // ให้ Update Salary เฉพาะของ Command 01-04

8
BMA.EHR.Command.Service/Responses/CommandReceiverResponse.cs
View file

@ -21,5 +21,13 @@
public double PositionSalaryAmount { get; set; } = 0; public double PositionSalaryAmount { get; set; } = 0;
public double MonthSalaryAmount { get; set; } = 0; public double MonthSalaryAmount { get; set; } = 0;
public string? Organization { get; set; }
public string? PositionName { get; set; }
public string? PositionLevel { get; set; }
public string? PositionType { get; set; }
public string? PositionNumber { get; set; }
public DateTime? BirthDate { get; set; }
} }
} }