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

fix issue : SIT ระบบบันทึกการลา>>รายการลา (ข้อมูลผู้สังกัดและเรียนไม่แสดง) #971

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-01-23 15:14:09 +07:00
parent 9774291573
commit b1f9378424
1 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -1163,6 +1163,18 @@ namespace BMA.EHR.Leave.Service.Controllers
var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category); var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category); var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
var orgName = rawData.Root ?? "";
if (rawData.Child1 != null && rawData.Child1 != "")
orgName += $"/{rawData.Child1}";
if (rawData.Child2 != null && rawData.Child2 != "")
orgName += $"/{rawData.Child2}";
if (rawData.Child3 != null && rawData.Child3 != "")
orgName += $"/{rawData.Child3}";
if (rawData.Child4 != null && rawData.Child4 != "")
orgName += $"/{rawData.Child4}";
var result = new GetLeaveRequestByIdDto var result = new GetLeaveRequestByIdDto
{ {
Id = rawData.Id, Id = rawData.Id,
@ -1235,7 +1247,10 @@ namespace BMA.EHR.Leave.Service.Controllers
Dear = rawData.Dear ?? "", Dear = rawData.Dear ?? "",
PositionName = rawData.PositionName ?? "", PositionName = rawData.PositionName ?? "",
PositionLevelName = rawData.PositionLevelName ?? "", PositionLevelName = rawData.PositionLevelName ?? "",
OrganizationName = rawData.OrganizationName ?? "", OrganizationName = orgName,
//OrganizationName = rawData.OrganizationName ?? "",
// fix issue : SIT ระบบบันทึกการลา>>รายการลา (ข้อมูลผู้สังกัดและเรียนไม่แสดง) #971
LeaveTypeCode = rawData.LeaveTypeCode ?? "" LeaveTypeCode = rawData.LeaveTypeCode ?? ""
}; };
@ -1780,6 +1795,16 @@ namespace BMA.EHR.Leave.Service.Controllers
//var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category); //var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
//var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category); //var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
var orgName = rawData.Root ?? "";
if (rawData.Child1 != null && rawData.Child1 != "")
orgName += $"/{rawData.Child1}";
if (rawData.Child2 != null && rawData.Child2 != "")
orgName += $"/{rawData.Child2}";
if (rawData.Child3 != null && rawData.Child3 != "")
orgName += $"/{rawData.Child3}";
if (rawData.Child4 != null && rawData.Child4 != "")
orgName += $"/{rawData.Child4}";
var result = new GetLeaveRequestForAdminByIdDto var result = new GetLeaveRequestForAdminByIdDto
{ {
Id = rawData.Id, Id = rawData.Id,
@ -1858,10 +1883,14 @@ namespace BMA.EHR.Leave.Service.Controllers
// OrganizationName = profile.Oc ?? "", // OrganizationName = profile.Oc ?? "",
// เปลี่ยนมาอ่านจากฐานข้อมูลแทน read_db // เปลี่ยนมาอ่านจากฐานข้อมูลแทน read_db
Dear = rawData.Dear ?? "", Dear = rawData.Dear ?? "",
PositionName = rawData.PositionName ?? "", PositionName = rawData.PositionName ?? "",
PositionLevelName = rawData.PositionLevelName ?? "", PositionLevelName = rawData.PositionLevelName ?? "",
OrganizationName = rawData.OrganizationName ?? "", OrganizationName = orgName,
//OrganizationName = rawData.OrganizationName ?? "",
// fix SIT ระบบบันทึกการลา>>รายการลา (ข้อมูลผู้สังกัดและเรียนไม่แสดง) #971
ApproveStep = rawData.ApproveStep ?? "-", ApproveStep = rawData.ApproveStep ?? "-",