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

fix Null Value
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-07-07 12:01:34 +07:00
parent 0e74ad730c
commit f2d01b8505
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1186,6 +1186,9 @@ namespace BMA.EHR.Leave.Service.Controllers
var checkout_base = DateTime.Parse($"{DateTime.Now.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}"); var checkout_base = DateTime.Parse($"{DateTime.Now.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
// var test = await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year);
// return Success(test);
var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year)) var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year))
.Select(d => new CheckInHistoryDto .Select(d => new CheckInHistoryDto
{ {
@ -2491,8 +2494,8 @@ namespace BMA.EHR.Leave.Service.Controllers
resultCheckInDateAndTime = DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckInTime}"); resultCheckInDateAndTime = resultCheckInDate is null ? null : DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckInTime}");
resultCheckOutDateAndTime = DateTime.Parse($"{resultCheckOutDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckOutTime}"); resultCheckOutDateAndTime = resultCheckOutDate is null ? null : DateTime.Parse($"{resultCheckOutDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckOutTime}");
// create result object to return // create result object to return
@ -2515,8 +2518,8 @@ namespace BMA.EHR.Leave.Service.Controllers
"LATE" : "LATE" :
"NORMAL", "NORMAL",
CheckOutStatus = resultCheckInDate == null ? null : CheckOutStatus = resultCheckInDateAndTime == null ? null :
resultCheckOutDate == null ? null : resultCheckOutDateAndTime == null ? null :
DateTime.Parse(resultCheckOutDateAndTime.Value.ToString("yyyy-MM-dd HH:mm")) < DateTime.Parse(resultCheckOutDateAndTime.Value.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ? DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
"ABSENT" : "ABSENT" :