แก้พ้นราชการ
This commit is contained in:
parent
b7f19d7077
commit
1828685e0e
50 changed files with 37955 additions and 454 deletions
|
|
@ -134,47 +134,64 @@ namespace BMA.EHR.Application.Repositories.Reports
|
|||
id = x.Id,
|
||||
reason = x.Reason,
|
||||
remove = x.Remove,
|
||||
profileId = x.Profile.Id,
|
||||
citizenId = x.Profile.CitizenId,
|
||||
prefix = x.Profile.Prefix == null ? "" : x.Profile.Prefix.Name,
|
||||
fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}",
|
||||
organizationOrganization = x.Profile.OrganizationOrganization,
|
||||
ocId = x.Profile.OcId,
|
||||
position = x.Profile.Position == null ? "-" : x.Profile.Position.Name,
|
||||
positionType = x.Profile.PositionType == null ? "-" : x.Profile.PositionType.Name,
|
||||
positionExecutive = x.Profile.PositionExecutive,
|
||||
posNo = x.Profile.PosNo == null ? "-" : x.Profile.PosNo.Name,
|
||||
positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? "-" : x.Profile.PositionEmployeePosition.Name,
|
||||
positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? "-" : x.Profile.PositionEmployeeLevel.Name,
|
||||
positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? "-" : x.Profile.PositionEmployeeGroup.Name,
|
||||
posNoEmployee = x.Profile.PosNoEmployee,
|
||||
profileId = x.profileId,
|
||||
prefix = x.prefix,
|
||||
firstName = x.firstName,
|
||||
lastName = x.lastName,
|
||||
citizenId = x.citizenId,
|
||||
root = x.root,
|
||||
rootId = x.rootId,
|
||||
rootShortName = x.rootShortName,
|
||||
child1 = x.child1,
|
||||
child1Id = x.child1Id,
|
||||
child1ShortName = x.child1ShortName,
|
||||
child2 = x.child2,
|
||||
child2Id = x.child2Id,
|
||||
child2ShortName = x.child2ShortName,
|
||||
child3 = x.child3,
|
||||
child3Id = x.child3Id,
|
||||
child3ShortName = x.child3ShortName,
|
||||
child4 = x.child4,
|
||||
child4Id = x.child4Id,
|
||||
child4ShortName = x.child4ShortName,
|
||||
posMasterNo = x.posMasterNo,
|
||||
position = x.position,
|
||||
posTypeId = x.posTypeId,
|
||||
posTypeName = x.posTypeName,
|
||||
posTypeRank = x.posTypeRank,
|
||||
posLevelId = x.posLevelId,
|
||||
posLevelName = x.posLevelName,
|
||||
posLevelRank = x.posLevelRank,
|
||||
posExecutiveId = x.posExecutiveId,
|
||||
posExecutiveName = x.posExecutiveName,
|
||||
posNo = x.posNo,
|
||||
})
|
||||
.ToListAsync();
|
||||
foreach (var r in profile_retire)
|
||||
{
|
||||
var data = new ProfileJsonRequest
|
||||
{
|
||||
order = r.order,
|
||||
id = r.id,
|
||||
reason = r.reason,
|
||||
remove = r.remove,
|
||||
profileId = r.profileId,
|
||||
citizenId = r.citizenId,
|
||||
prefix = r.prefix,
|
||||
fullName = r.fullName,
|
||||
organizationOrganization = r.organizationOrganization,
|
||||
oc = r.ocId == null ? null : _organizationCommonRepository.GetOrganizationNameFullPath(r.ocId.Value),
|
||||
position = r.position,
|
||||
positionType = r.positionType,
|
||||
positionExecutive = r.positionExecutive,
|
||||
posNo = r.posNo,
|
||||
positionEmployeePosition = r.positionEmployeePosition,
|
||||
positionEmployeeLevel = r.positionEmployeeLevel,
|
||||
positionEmployeeGroup = r.positionEmployeeGroup,
|
||||
posNoEmployee = r.posNoEmployee,
|
||||
};
|
||||
retires.Add(data);
|
||||
}
|
||||
// foreach (var r in profile_retire)
|
||||
// {
|
||||
// var data = new ProfileJsonRequest
|
||||
// {
|
||||
// order = r.order,
|
||||
// id = r.id,
|
||||
// reason = r.reason,
|
||||
// remove = r.remove,
|
||||
// profileId = r.profileId,
|
||||
// citizenId = r.citizenId,
|
||||
// prefix = r.prefix,
|
||||
// fullName = r.fullName,
|
||||
// organizationOrganization = r.organizationOrganization,
|
||||
// oc = r.ocId == null ? null : _organizationCommonRepository.GetOrganizationNameFullPath(r.ocId.Value),
|
||||
// position = r.position,
|
||||
// positionType = r.positionType,
|
||||
// positionExecutive = r.positionExecutive,
|
||||
// posNo = r.posNo,
|
||||
// positionEmployeePosition = r.positionEmployeePosition,
|
||||
// positionEmployeeLevel = r.positionEmployeeLevel,
|
||||
// positionEmployeeGroup = r.positionEmployeeGroup,
|
||||
// posNoEmployee = r.posNoEmployee,
|
||||
// };
|
||||
// retires.Add(data);
|
||||
// }
|
||||
|
||||
return new { retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = retires };
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue