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

fix Approve การลงเวลากรณีพิเศษ
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-06-17 11:02:42 +07:00
parent 326a258e2b
commit 2d7459da25
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2077,6 +2077,20 @@ namespace BMA.EHR.Leave.Service.Controllers
processTimeStamp.EditStatus = "APPROVE"; processTimeStamp.EditStatus = "APPROVE";
processTimeStamp.EditReason = req.Reason; processTimeStamp.EditReason = req.Reason;
if (requestData.CheckInEdit)
{
processTimeStamp.CheckInPOI = requestData.POI ?? "";
processTimeStamp.CheckInLat = requestData.Latitude ?? 0;
processTimeStamp.CheckInLon = requestData.Longitude ?? 0;
}
if (requestData.CheckOutEdit)
{
processTimeStamp.CheckOutPOI = requestData.POI ?? "";
processTimeStamp.CheckOutLat = requestData.Latitude ?? 0;
processTimeStamp.CheckOutLon = requestData.Longitude ?? 0;
}
await _processUserTimeStampRepository.AddAsync(processTimeStamp); await _processUserTimeStampRepository.AddAsync(processTimeStamp);
} }
else else
@ -2085,9 +2099,9 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
processTimeStamp.CheckIn = DateTime.Parse($"{requestData.CheckDate.Date.ToString("yyyy-MM-dd")} {req.CheckInTime}"); processTimeStamp.CheckIn = DateTime.Parse($"{requestData.CheckDate.Date.ToString("yyyy-MM-dd")} {req.CheckInTime}");
processTimeStamp.CheckInRemark = req.Reason; processTimeStamp.CheckInRemark = req.Reason;
processTimeStamp.CheckInLat = 0; //processTimeStamp.CheckInLat = 0;
processTimeStamp.CheckInLon = 0; //processTimeStamp.CheckInLon = 0;
processTimeStamp.CheckInPOI = "ลงเวลากรณีพิเศษ"; //processTimeStamp.CheckInPOI = "ลงเวลากรณีพิเศษ";
processTimeStamp.CheckInStatus = req.CheckInStatus; processTimeStamp.CheckInStatus = req.CheckInStatus;
processTimeStamp.CheckInPOI = requestData.POI ?? ""; processTimeStamp.CheckInPOI = requestData.POI ?? "";
@ -2099,9 +2113,9 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
processTimeStamp.CheckOut = DateTime.Parse($"{requestData.CheckDate.Date.ToString("yyyy-MM-dd")} {req.CheckOutTime}"); processTimeStamp.CheckOut = DateTime.Parse($"{requestData.CheckDate.Date.ToString("yyyy-MM-dd")} {req.CheckOutTime}");
processTimeStamp.CheckOutRemark = req.Reason; processTimeStamp.CheckOutRemark = req.Reason;
processTimeStamp.CheckOutLat = 0; //processTimeStamp.CheckOutLat = 0;
processTimeStamp.CheckOutLon = 0; //processTimeStamp.CheckOutLon = 0;
processTimeStamp.CheckOutPOI = "ลงเวลากรณีพิเศษ"; //processTimeStamp.CheckOutPOI = "ลงเวลากรณีพิเศษ";
processTimeStamp.CheckOutStatus = req.CheckOutStatus; processTimeStamp.CheckOutStatus = req.CheckOutStatus;
processTimeStamp.CheckOutPOI = requestData.POI ?? ""; processTimeStamp.CheckOutPOI = requestData.POI ?? "";