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

fix : LV1_007 - ประวัติการลงเวลา (USER)_defect_005#181

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-12-18 10:46:39 +07:00
parent bc2e7b8b5e
commit 90f7667242
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BMA.EHR.Leave.Service/Controllers/LeaveController.cs
View file

@ -549,9 +549,13 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckOutDate = d.CheckOut == null ? null : d.CheckOut.Value.Date, CheckOutDate = d.CheckOut == null ? null : d.CheckOut.Value.Date,
CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm:ss"), CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm:ss"),
CheckOutLocation = d.CheckOutPOI ?? "", CheckOutLocation = d.CheckOutPOI ?? "",
CheckOutStatus = d.CheckOut == null ? null : DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) < CheckOutStatus = d.CheckOut == null ? null :
DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ? DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
"LATE" : "LATE" :
DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
"ABSENT" :
"NORMAL", "NORMAL",
IsEdit = _processUserTimeStampRepository.IsEditRequest(userId, d.CheckIn.Date) IsEdit = _processUserTimeStampRepository.IsEditRequest(userId, d.CheckIn.Date)