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

fix #1188

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-02-21 12:39:01 +07:00
parent aa31ac0f06
commit 9b0f1f0b3e
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1224,6 +1224,10 @@ namespace BMA.EHR.Leave.Service.Controllers
LeaveNumber = rawData.LeaveNumber, LeaveNumber = rawData.LeaveNumber,
LeaveDetail = rawData.LeaveDetail, LeaveDetail = rawData.LeaveDetail,
LeaveDocument = new(), LeaveDocument = new(),
LeaveLast = rawData.LeaveLast,
//LeaveDocument = rawData.LeaveDocument == null ? null : await _minIOService.ImagesPath(rawData.LeaveDocument.Id), //LeaveDocument = rawData.LeaveDocument == null ? null : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
LeaveDraftDocument = rawData.LeaveDraftDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDraftDocument.Id), LeaveDraftDocument = rawData.LeaveDraftDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDraftDocument.Id),

8
BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs
View file

@ -107,13 +107,13 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public string? CoupleDayCountryHistory { get; set; } public string? CoupleDayCountryHistory { get; set; }
public string? CoupleDayTotalHistory { get; set; } public string? CoupleDayTotalHistory { get; set; }
public DateTime? CoupleDayStartDateHistory { get; set; } public DateTime? CoupleDayStartDateHistory { get; set; }
public DateTime? CoupleDayEndDateHistory { get; set; } public DateTime? CoupleDayEndDateHistory { get; set; }
public string? CoupleDaySumTotalHistory { get; set; } public string? CoupleDaySumTotalHistory { get; set; }
public string? Dear { get; set; } = string.Empty; public string? Dear { get; set; } = string.Empty;
@ -124,5 +124,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public string? PositionLevelName { get; set; } = string.Empty; public string? PositionLevelName { get; set; } = string.Empty;
public string? OrganizationName { get; set; } = string.Empty; public string? OrganizationName { get; set; } = string.Empty;
public DateTime? LeaveLast { get; set; }
} }
} }