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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-09-15 17:08:08 +07:00
commit 9301935f9a
40 changed files with 16527 additions and 35 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)
.ThenInclude(x => x.Salaries)
.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);
if (data == null)
throw new Exception(GlobalMessages.DataNotFound);
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 order = 1;