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

บันทึกข้อมูลลูกจ้างตอนออกคำสั่ง

Browse source
This commit is contained in:
Kittapath 2023-09-15 15:30:02 +07:00
parent 20bd96cf15
commit aafc3dc311
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5732,13 +5732,26 @@ namespace BMA.EHR.Application.Repositories.Commands
.Include(x => x.Profile) .Include(x => x.Profile)
.ThenInclude(x => x.Salaries) .ThenInclude(x => x.Salaries)
.ThenInclude(x => x.PositionLevel) .ThenInclude(x => x.PositionLevel)
.Include(x => x.OrgEmployee)
.ThenInclude(x => x.Organization)
.Include(x => x.OrgEmployee)
.ThenInclude(x => x.PositionEmployeePosition)
.Include(x => x.OrgEmployee)
.ThenInclude(x => x.PositionEmployeeLine)
.FirstOrDefaultAsync(x => x.Id == recv.RefPlacementProfileId); .FirstOrDefaultAsync(x => x.Id == recv.RefPlacementProfileId);
if (data == null) if (data == null)
throw new Exception(GlobalMessages.DataNotFound); throw new Exception(GlobalMessages.DataNotFound);
data.Profile.EmployeeClass = "perm"; // ลจ ประจำ data.Profile.EmployeeClass = "perm"; // ลจ ประจำ
data.Profile.OcId = data.OrgEmployee.Organization == null ? null : data.OrgEmployee.Organization.Id;
// data.Profile.Oc = "xxx";
data.Profile.PosNoEmployee = data.OrgEmployee.PosNo;
data.Profile.PositionEmployeePosition = data.OrgEmployee.PositionEmployeePosition;
// data.Profile.PositionEmployeePositionSide = data.OrgEmployee.OrganizationPositionEmployeePositionSides;
// data.Profile.PositionEmployeeLevel = data.OrgEmployee.OrganizationPositionEmployeeLevels;
// data.Profile.PositionEmployeeGroup = data.OrgEmployee.employee;
data.Profile.PositionEmployeeLine = data.OrgEmployee.PositionEmployeeLine;
var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault();
var order = 1; var order = 1;

4
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -543,8 +543,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (retirementDeceased == null) if (retirementDeceased == null)
return Error(GlobalMessages.RetirementDeceasedNotFound, 404); return Error(GlobalMessages.RetirementDeceasedNotFound, 404);
if (retirementDeceased.DocumentForward == null) // if (retirementDeceased.DocumentForward == null)
return Error(GlobalMessages.NoFileToUpload, 404); // return Error(GlobalMessages.NoFileToUpload, 404);
// create command payload // create command payload
var payload_attach = new List<PayloadAttachment>(); var payload_attach = new List<PayloadAttachment>();