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 2024-07-08 17:09:59 +07:00
commit 12733ea779
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2935,7 +2935,7 @@ namespace BMA.EHR.Application.Repositories.Commands
positionType = placementProfile.posTypeName == null ? string.Empty : placementProfile.posTypeName, positionType = placementProfile.posTypeName == null ? string.Empty : placementProfile.posTypeName,
positionLevel = placementProfile.posLevelName == null ? string.Empty : placementProfile.posLevelName, positionLevel = placementProfile.posLevelName == null ? string.Empty : placementProfile.posLevelName,
refCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", refCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
templateDoc = string.Empty, templateDoc = "คำสั่งแต่งตั้ง คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}",
}); });
var _result = await _res.Content.ReadAsStringAsync(); var _result = await _res.Content.ReadAsStringAsync();
} }

6
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -778,9 +778,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
child4 = x.child4, child4 = x.child4,
child4Id = x.child4Id, child4Id = x.child4Id,
position = x.position, position = x.position,
positionType = x.posTypeName, posTypeName = x.posTypeName,
positionLevel = x.posLevelName, posLevelName = x.posLevelName,
positionExecutive = x.posExecutiveName, posExecutiveName = x.posExecutiveName,
posNo = x.posNo, posNo = x.posNo,
// positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name, // positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name,
// positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name, // positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name,