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

api ลาออก

Browse source
This commit is contained in:
Kittapath 2023-08-08 11:04:41 +07:00
parent 7b038f0131
commit ed52581e58
15 changed files with 788 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BMA.EHR.Insignia.Service/Controllers/InsigniaPeriodController.cs
View file

@ -69,6 +69,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
period_end = p.EndDate,
period_status = _repository.CalStatusByDate(p.StartDate, p.EndDate, p.Year.ToString()),
period_year = p.Year,
period_isActive = p.IsActive,
period_doc = p.ReliefDoc == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.ReliefDoc.Id,
})
.ToListAsync();
@ -84,6 +85,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
period_end = insigniaPeriod.period_end,
period_status = insigniaPeriod.period_status,
period_year = insigniaPeriod.period_year,
period_isActive = insigniaPeriod.period_isActive,
period_doc = insigniaPeriod.period_doc == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaPeriod.period_doc),
};
data.Add(_data);
@ -115,6 +117,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
period_end = p.EndDate,
period_status = _repository.CalStatusByDate(p.StartDate, p.EndDate, p.Year.ToString()),
period_year = p.Year,
period_isActive = p.IsActive,
period_doc = p.ReliefDoc == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.ReliefDoc.Id,
})
.FirstOrDefaultAsync();
@ -130,6 +133,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
period_end = data.period_end,
period_status = data.period_status,
period_year = data.period_year,
period_isActive = data.period_isActive,
period_doc = data.period_doc == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.period_doc),
};
@ -162,6 +166,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
EndDate = Request.Form.ContainsKey("EndDate") ? DateTime.Parse(Request.Form["EndDate"]) : DateTime.Now,
Amount = Request.Form.ContainsKey("Amount") ? Request.Form["Amount"] : "",
Type = type.Trim().ToUpper(),
IsActive = true,
CreatedUserId = FullName ?? "",
CreatedFullName = UserId ?? "System Administrator",
CreatedAt = DateTime.Now,

14
BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs
View file

@ -457,7 +457,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
return Success();
}
else
return Error(GlobalMessages.InvalidInsigniaRequest);
return Error(GlobalMessages.InsigniaRequestNotFound);
}
#endregion
@ -469,10 +469,10 @@ namespace BMA.EHR.Insignia.Service.Controllers
{
var result = await _repository.GetInsigniaRequest(Royal_Type, ocId);
if (result == null)
return Error(GlobalMessages.InvalidInsigniaRequest);
return Error(GlobalMessages.InsigniaRequestNotFound);
var requestId = await _repository.GetRequestId(result.PeriodId, ocId);
if (requestId == null)
return Error(GlobalMessages.InvalidInsigniaRequest);
return Error(GlobalMessages.InsigniaRequestNotFound);
var requestNew = await _context.InsigniaRequests.FirstOrDefaultAsync(i => i.Id == requestId);
if (requestNew != null)
{
@ -481,7 +481,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
return Success();
}
else
return Error(GlobalMessages.InvalidInsigniaRequest);
return Error(GlobalMessages.InsigniaRequestNotFound);
}
[HttpPost("status/director/reject/{ocId:length(36)}")]
@ -489,10 +489,10 @@ namespace BMA.EHR.Insignia.Service.Controllers
{
var result = await _repository.GetInsigniaRequest(Royal_Type, ocId);
if (result == null)
return Error(GlobalMessages.InvalidInsigniaRequest);
return Error(GlobalMessages.InsigniaRequestNotFound);
var requestId = await _repository.GetRequestId(result.PeriodId, ocId);
if (requestId == null)
return Error(GlobalMessages.InvalidInsigniaRequest);
return Error(GlobalMessages.InsigniaRequestNotFound);
var requestNew = await _context.InsigniaRequests.FirstOrDefaultAsync(i => i.Id == requestId);
if (requestNew != null)
{
@ -501,7 +501,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
return Success();
}
else
return Error(GlobalMessages.InvalidInsigniaRequest);
return Error(GlobalMessages.InsigniaRequestNotFound);
}
#endregion