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

fix defect

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-12-06 14:02:49 +07:00
parent 48c2346487
commit ff22849bda
1 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -346,16 +346,34 @@ namespace BMA.EHR.Leave.Service.Controllers
} }
else else
{ {
ret = new CheckInResultDto if (data.CheckOut != null)
{ {
StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning, ret = new CheckInResultDto
EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning, {
StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon, StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning,
EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon, EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning,
Description = duty == null ? "-" : duty.Description, StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon,
CheckInTime = data.CheckIn, EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon,
CheckInId = data.CheckOut == null ? data.Id : null, Description = duty == null ? "-" : duty.Description,
}; CheckInTime = null,
CheckInId = null,
};
}
else
{
ret = new CheckInResultDto
{
StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning,
EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning,
StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon,
EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon,
Description = duty == null ? "-" : duty.Description,
CheckInTime = data.CheckIn,
CheckInId = data.Id,
};
}
} }
return Success(ret); return Success(ret);