fix: api ลงเวลากรณีพิเศษ
This commit is contained in:
parent
1a6fe487aa
commit
1960f243d0
1 changed files with 11 additions and 9 deletions
|
|
@ -1213,20 +1213,22 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
|
||||
foreach (var data in rawData)
|
||||
{
|
||||
var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
|
||||
if (profile == null)
|
||||
{
|
||||
return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
|
||||
}
|
||||
// var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
|
||||
// if (profile == null)
|
||||
// {
|
||||
// return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
|
||||
// }
|
||||
//var userRound = await _dutyTimeRepository.GetByIdAsync(profile.DutyTimeId ?? Guid.Empty);
|
||||
|
||||
var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id);
|
||||
var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
|
||||
var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
|
||||
//var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id);
|
||||
//var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
|
||||
//var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
|
||||
|
||||
var checkInData = await _userTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate);
|
||||
|
||||
var duty = userRound ?? getDefaultRound;
|
||||
//var duty = userRound ?? getDefaultRound;
|
||||
|
||||
var duty = getDefaultRound;
|
||||
|
||||
// create result object to return
|
||||
var resObj = new GetAdditionalCheckRequestDto
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue