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

เพิ่มค่าปะเภทลาอุปสมบท

Browse source
This commit is contained in:
Kittapath 2024-08-01 13:41:35 +07:00
parent c62981e93c
commit c802ab718f
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -921,7 +921,8 @@ namespace BMA.EHR.Leave.Service.Controllers
IsDelete = item.LeaveStatus == "DELETE", IsDelete = item.LeaveStatus == "DELETE",
Status = item.LeaveStatus, Status = item.LeaveStatus,
LeaveStartDate = item.LeaveStartDate, LeaveStartDate = item.LeaveStartDate,
LeaveEndDate = item.LeaveEndDate LeaveEndDate = item.LeaveEndDate,
HajjDayStatus = item.HajjDayStatus,
}; };
result.Add(res); result.Add(res);
} }
@ -1120,7 +1121,8 @@ namespace BMA.EHR.Leave.Service.Controllers
Level = item.PositionLevelName ?? "-", Level = item.PositionLevelName ?? "-",
Agency = "-", //agency == null ? "" : agency.Name, Agency = "-", //agency == null ? "" : agency.Name,
Org = "-", //gov_agency == null ? "" : gov_agency.Name, Org = "-", //gov_agency == null ? "" : gov_agency.Name,
LeaveRange = item.LeaveRange ?? "ALL" LeaveRange = item.LeaveRange ?? "ALL",
HajjDayStatus = item.HajjDayStatus,
}; };
result.Add(res); result.Add(res);
} }

2
BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs
View file

@ -29,5 +29,7 @@
public string Level { get; set; } = string.Empty; public string Level { get; set; } = string.Empty;
public string LeaveRange { get; set; } = string.Empty; public string LeaveRange { get; set; } = string.Empty;
public bool? HajjDayStatus { get; set; }
} }
} }

1
BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
View file

@ -15,6 +15,7 @@
public string Status { get; set; } public string Status { get; set; }
public bool IsDelete { get; set; } public bool IsDelete { get; set; }
public bool? HajjDayStatus { get; set; }
public DateTime LeaveStartDate { get; set; } = DateTime.Now; public DateTime LeaveStartDate { get; set; } = DateTime.Now;