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 2023-10-11 23:25:54 +07:00
parent c285b4dd72
commit fb6e71c60c
4 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1845,6 +1845,7 @@ namespace BMA.EHR.Application.Repositories.Commands
OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id,
OrganizationShortName = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Name,
OrganizationOrganizationId = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Id,
OrganizationOrganization = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Name,
OcId = placementProfile.OrganizationPosition!.Organization!.Id,
Oc = _organizationCommonRepository.GetOrganizationNameFullPath(placementProfile.OrganizationPosition!.Organization!.Id, false, false, "/"),
@ -1949,6 +1950,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = positionNumber!.Id,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -2186,6 +2188,7 @@ namespace BMA.EHR.Application.Repositories.Commands
profile.OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id;
profile.OrganizationShortName = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Name;
profile.OrganizationOrganizationId = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Id;
profile.OrganizationOrganization = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Name;
profile.OcId = placementProfile.OrganizationPosition!.Organization!.Id;
profile.Oc = _organizationCommonRepository.GetOrganizationNameFullPath(placementProfile.OrganizationPosition!.Organization!.Id, false, false, "/");
}
@ -2226,6 +2229,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = positionNumber!.Id,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
PositionEmployeeGroupId = null,
@ -2437,6 +2441,7 @@ namespace BMA.EHR.Application.Repositories.Commands
profile.OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id;
profile.OrganizationShortName = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Name;
profile.OrganizationOrganizationId = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Id;
profile.OrganizationOrganization = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Name;
profile.OcId = placementProfile.OrganizationPosition!.Organization!.Id;
profile.Oc = _organizationCommonRepository.GetOrganizationNameFullPath(placementProfile.OrganizationPosition!.Organization!.Id, false, false, "/");
}
@ -2477,6 +2482,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = positionNumber!.Id,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
PositionEmployeeGroupId = null,
@ -2665,6 +2671,7 @@ namespace BMA.EHR.Application.Repositories.Commands
profile.OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id;
profile.OrganizationShortName = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Name;
profile.OrganizationOrganizationId = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Id;
profile.OrganizationOrganization = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Name;
profile.OcId = placementProfile.OrganizationPosition!.Organization!.Id;
profile.Oc = _organizationCommonRepository.GetOrganizationNameFullPath(placementProfile.OrganizationPosition!.Organization!.Id, false, false, "/");
}
@ -2705,6 +2712,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = positionNumber!.Id,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
PositionEmployeeGroupId = null,
@ -2893,6 +2901,7 @@ namespace BMA.EHR.Application.Repositories.Commands
profile.OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id;
profile.OrganizationShortName = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Name;
profile.OrganizationOrganizationId = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Id;
profile.OrganizationOrganization = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Name;
profile.OcId = placementProfile.OrganizationPosition!.Organization!.Id;
profile.Oc = _organizationCommonRepository.GetOrganizationNameFullPath(placementProfile.OrganizationPosition!.Organization!.Id, false, false, "/");
}
@ -2933,6 +2942,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = positionNumber!.Id,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
PositionEmployeeGroupId = null,
@ -3121,6 +3131,7 @@ namespace BMA.EHR.Application.Repositories.Commands
profile.OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id;
profile.OrganizationShortName = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Name;
profile.OrganizationOrganizationId = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Id;
profile.OrganizationOrganization = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Name;
profile.OcId = placementProfile.OrganizationPosition!.Organization!.Id;
profile.Oc = _organizationCommonRepository.GetOrganizationNameFullPath(placementProfile.OrganizationPosition!.Organization!.Id, false, false, "/");
}
@ -3161,6 +3172,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = positionNumber!.Id,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
PositionEmployeeGroupId = null,
@ -3398,6 +3410,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
PositionEmployeeGroupId = null,
@ -3644,6 +3657,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
PositionEmployeeGroupId = null,
@ -3816,6 +3830,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -3990,6 +4005,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -4167,6 +4183,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -4346,6 +4363,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -4627,6 +4645,7 @@ namespace BMA.EHR.Application.Repositories.Commands
OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id,
OrganizationShortName = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Name,
OrganizationOrganizationId = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Id,
OrganizationOrganization = placementProfile.OrganizationPosition!.Organization!.OrganizationOrganization!.Name,
OcId = placementProfile.OrganizationPosition!.Organization!.Id,
Oc = _organizationCommonRepository.GetOrganizationNameFullPath(placementProfile.OrganizationPosition!.Organization!.Id, false, false, "/"),
@ -4666,6 +4685,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = positionNumber!.Id,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -4871,6 +4891,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -5049,6 +5070,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -5228,6 +5250,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -5407,6 +5430,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -5586,6 +5610,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -5765,6 +5790,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -5954,6 +5980,7 @@ namespace BMA.EHR.Application.Repositories.Commands
//PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
@ -6108,6 +6135,8 @@ namespace BMA.EHR.Application.Repositories.Commands
.ThenInclude(x => x.OrganizationShortName)
.Include(x => x.OrgEmployee)
.ThenInclude(x => x.OrganizationOrganization)
.Include(x => x.OrgEmployee)
.ThenInclude(x => x.Organization)
.FirstOrDefaultAsync(x => x.Id == recv.RefPlacementProfileId);
if (data == null)
@ -6144,6 +6173,7 @@ namespace BMA.EHR.Application.Repositories.Commands
//OrganizationShortNameId = lastSarary.OrganizationShortNameId,
//PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,
//PositionEmployeeGroupId = null,
//PositionEmployeeLevelId = null,
@ -6313,6 +6343,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PosNoId = lastSarary.PosNoId,
CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
CommandTypeName = command.CommandType.Name,

1
BMA.EHR.Application/Repositories/OrganizationCommonRepository.cs
View file

@ -62,6 +62,7 @@ namespace BMA.EHR.Application.Repositories
var ocData = _dbContext.Set<OrganizationEntity>()
.Include(x => x.OrganizationOrganization)
.Include(x => x.Parent)
.Where(x => x.Parent != null)
.Select(x => new
{
Id = x.Id,