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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
kittapath 2025-02-21 19:11:31 +07:00
commit 3d0994b29b
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -713,6 +713,12 @@ namespace BMA.EHR.Leave.Service.Controllers
} }
var leaveLimit = 0.0; var leaveLimit = 0.0;
var remainPrev = 0.0;
if (leaveType.Code.Trim().ToUpper() == "LV-005") if (leaveType.Code.Trim().ToUpper() == "LV-005")
{ {
if (govAge >= 180) if (govAge >= 180)
@ -721,10 +727,14 @@ namespace BMA.EHR.Leave.Service.Controllers
if (govAge >= 3650) if (govAge >= 3650)
{ {
leaveLimit = 30 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); leaveLimit = 30 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay);
remainPrev = 30 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); // หายอดวันลาที่เหลือของปีก่อน
if (remainPrev >= 20) remainPrev = 20;
} }
else else
{ {
leaveLimit = 20 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); leaveLimit = 20 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay);
remainPrev = 20 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); // หายอดวันลาที่เหลือของปีก่อน
if (remainPrev >= 10) remainPrev = 10;
} }
} }
else else
@ -737,7 +747,13 @@ namespace BMA.EHR.Leave.Service.Controllers
var sumLeave = await _leaveRequestRepository.GetSumLeaveByTypeForUserAsync(userId, req.Type, thisYear); var sumLeave = await _leaveRequestRepository.GetSumLeaveByTypeForUserAsync(userId, req.Type, thisYear);
var restOldDay = await _leaveRequestRepository.GetRestDayTotalByYearForUserAsync(userId, thisYear - 1); var restOldDay = 0.00;
if (leaveType.Code.Trim().ToUpper() == "LV-005")
{
restOldDay = remainPrev;
}
else
restOldDay = await _leaveRequestRepository.GetRestDayTotalByYearForUserAsync(userId, thisYear - 1);
var lastSalary = profile.ProfileSalary; var lastSalary = profile.ProfileSalary;
@ -1224,6 +1240,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),
@ -2023,7 +2043,7 @@ namespace BMA.EHR.Leave.Service.Controllers
else else
leaveLimit = 0; leaveLimit = 0;
} }
var data = new var data = new
{ {
Id = leaveType.Id, Id = leaveType.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; }
} }
} }