report leave
This commit is contained in:
parent
962d7ec7ff
commit
5a248f212d
1 changed files with 6 additions and 9 deletions
|
|
@ -1189,23 +1189,20 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
|
||||
}
|
||||
}
|
||||
|
||||
DateTime? checkIn = p.CheckIn ?? null;
|
||||
DateTime? checkOut = p.CheckOut ?? null;
|
||||
var emp = new
|
||||
{
|
||||
no = count,
|
||||
fullName = fullName,
|
||||
dutyTimeName = $"{duty.StartTimeMorning} - {duty.EndTimeAfternoon} น.",
|
||||
checkInLocation = p.CheckInPOI,
|
||||
checkInTime = $"{p.CheckIn.ToString("HH:mm")} น.",
|
||||
checkInTime = $"{checkIn?.ToString("HH:mm") ?? ""} น.",
|
||||
checkOutLocation = p.CheckOutPOI ?? "",
|
||||
checkOutTime = p.CheckOut != null ?
|
||||
$"{p.CheckOut.Value.ToString("HH:mm")} น." :
|
||||
"",
|
||||
checkOutTime = $"{checkOut?.ToString("HH:mm") ?? ""} น.",
|
||||
remark = "",
|
||||
checkInDate = p.CheckIn.Date.ToThaiFullDate2().ToThaiNumber(),
|
||||
checkedOutDate = p.CheckOut != null ?
|
||||
p.CheckOut.Value.ToThaiFullDate2().ToThaiNumber() :
|
||||
"",
|
||||
checkInDate = checkIn?.ToThaiFullDate2()?.ToThaiNumber() ?? "",
|
||||
checkedOutDate = checkOut?.ToThaiFullDate2()?.ToThaiNumber() ?? "",
|
||||
};
|
||||
employees.Add(emp);
|
||||
count++;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue