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

report leave

Browse source
This commit is contained in:
kittapath 2024-12-16 10:33:52 +07:00
parent 962d7ec7ff
commit 5a248f212d
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -1189,23 +1189,20 @@ namespace BMA.EHR.Leave.Service.Controllers
return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound); return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
} }
} }
DateTime? checkIn = p.CheckIn ?? null;
DateTime? checkOut = p.CheckOut ?? null;
var emp = new var emp = new
{ {
no = count, no = count,
fullName = fullName, fullName = fullName,
dutyTimeName = $"{duty.StartTimeMorning} - {duty.EndTimeAfternoon} น.", dutyTimeName = $"{duty.StartTimeMorning} - {duty.EndTimeAfternoon} น.",
checkInLocation = p.CheckInPOI, checkInLocation = p.CheckInPOI,
checkInTime = $"{p.CheckIn.ToString("HH:mm")} น.", checkInTime = $"{checkIn?.ToString("HH:mm") ?? ""} น.",
checkOutLocation = p.CheckOutPOI ?? "", checkOutLocation = p.CheckOutPOI ?? "",
checkOutTime = p.CheckOut != null ? checkOutTime = $"{checkOut?.ToString("HH:mm") ?? ""} น.",
$"{p.CheckOut.Value.ToString("HH:mm")} น." :
"",
remark = "", remark = "",
checkInDate = p.CheckIn.Date.ToThaiFullDate2().ToThaiNumber(), checkInDate = checkIn?.ToThaiFullDate2()?.ToThaiNumber() ?? "",
checkedOutDate = p.CheckOut != null ? checkedOutDate = checkOut?.ToThaiFullDate2()?.ToThaiNumber() ?? "",
p.CheckOut.Value.ToThaiFullDate2().ToThaiNumber() :
"",
}; };
employees.Add(emp); employees.Add(emp);
count++; count++;