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

#2587
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 2m3s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-07-03 11:17:17 +07:00
parent b05e7cc3ab
commit 0cb199d0ee
1 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

40
BMA.EHR.Leave/Controllers/LeaveController.cs
View file

@ -3308,8 +3308,6 @@ namespace BMA.EHR.Leave.Service.Controllers
return Error("ไม่สามารถขอลงเวลากรณีพิเศษในวันที่มากกว่าวันที่ปัจจุบันได้", StatusCodes.Status400BadRequest); return Error("ไม่สามารถขอลงเวลากรณีพิเศษในวันที่มากกว่าวันที่ปัจจุบันได้", StatusCodes.Status400BadRequest);
} }
var userId = UserId != null ? Guid.Parse(UserId) : Guid.Empty; var userId = UserId != null ? Guid.Parse(UserId) : Guid.Empty;
var checkin = await _userTimeStampRepository.GetTimestampByDateAsync(userId, req.CheckDate.Date); var checkin = await _userTimeStampRepository.GetTimestampByDateAsync(userId, req.CheckDate.Date);
@ -3569,9 +3567,21 @@ namespace BMA.EHR.Leave.Service.Controllers
var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty; var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
var userRound = await _dutyTimeRepository.GetByIdAsync(roundId); var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
var checkInData = await _userTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate); var checkInData = await _userTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate);
var duty = userRound ?? getDefaultRound; var duty = userRound ?? getDefaultRound;
var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(data.KeycloakUserId, data.CheckDate.Date);
var startTimeMorning = leaveReq is null ? duty.StartTimeMorning :
leaveReq.LeaveRange == "MORNING" ? duty.StartTimeAfternoon : duty.StartTimeMorning;
var endTimeMorning = leaveReq is null ? duty.EndTimeMorning :
leaveReq.LeaveRange == "MORNING" ? duty.StartTimeAfternoon : duty.EndTimeMorning;
var startTimeAfterNoon = duty.StartTimeAfternoon;
var endTimeAfterNoon = duty.EndTimeAfternoon;
//var duty = getDefaultRound; //var duty = getDefaultRound;
// create result object to return // create result object to return
@ -3612,10 +3622,15 @@ namespace BMA.EHR.Leave.Service.Controllers
"ABSENT" : "ABSENT" :
"NORMAL", "NORMAL",
StartTimeMorning = duty.StartTimeMorning, // StartTimeMorning = duty.StartTimeMorning,
EndTimeMorning = duty.EndTimeMorning, // EndTimeMorning = duty.EndTimeMorning,
StartTimeAfternoon = duty.StartTimeAfternoon, // StartTimeAfternoon = duty.StartTimeAfternoon,
EndTimeAfternoon = duty.EndTimeAfternoon, // EndTimeAfternoon = duty.EndTimeAfternoon,
StartTimeMorning = startTimeMorning,
EndTimeMorning = endTimeMorning,
StartTimeAfternoon = startTimeAfterNoon,
EndTimeAfternoon = endTimeAfterNoon,
Reason = data.Comment ?? "", Reason = data.Comment ?? "",
Status = data.Status, Status = data.Status,
@ -4193,11 +4208,22 @@ namespace BMA.EHR.Leave.Service.Controllers
DateTime? resultCheckInDate, resultCheckOutDate, resultCheckInDateAndTime, resultCheckOutDateAndTime; DateTime? resultCheckInDate, resultCheckOutDate, resultCheckInDateAndTime, resultCheckOutDateAndTime;
string resultCheckInTime, resultCheckOutTime; string resultCheckInTime, resultCheckOutTime;
string resultCheckInLocation = "", resultCheckOutLocation = ""; string resultCheckInLocation = "", resultCheckOutLocation = "";
var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(data.KeycloakUserId, data.CheckDate.Date);
var startTimeMorning = leaveReq is null ? duty.StartTimeMorning :
leaveReq.LeaveRange == "MORNING" ? duty.StartTimeAfternoon : duty.StartTimeMorning;
var endTimeMorning = leaveReq is null ? duty.EndTimeMorning :
leaveReq.LeaveRange == "MORNING" ? duty.StartTimeAfternoon : duty.EndTimeMorning;
var startTimeAfterNoon = duty.StartTimeAfternoon;
var endTimeAfterNoon = duty.EndTimeAfternoon;
if (data.CheckInEdit) if (data.CheckInEdit)
{ {
resultCheckInDate = data.CheckDate.Date; resultCheckInDate = data.CheckDate.Date;
resultCheckInTime = duty.StartTimeMorning; //resultCheckInTime = duty.StartTimeMorning;
resultCheckInTime = startTimeMorning;
resultCheckInLocation = data.POI ?? ""; resultCheckInLocation = data.POI ?? "";
} }
else else