find org v2
This commit is contained in:
parent
7e71f528ab
commit
cb074e3e25
2 changed files with 4 additions and 3 deletions
|
|
@ -574,6 +574,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
// endDate = endDate
|
// endDate = endDate
|
||||||
date = endDate
|
date = endDate
|
||||||
};
|
};
|
||||||
|
Console.WriteLine(body);
|
||||||
|
|
||||||
var profiles = new List<SearchProfileDto>();
|
var profiles = new List<SearchProfileDto>();
|
||||||
|
|
||||||
|
|
@ -585,7 +586,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
return raw.Result;
|
return raw.Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return new List<GetProfileByKeycloakIdRootDto>();
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
|
@ -983,7 +984,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var apiPath = $"{_configuration["API"]}/org/find/all";
|
var apiPath = $"{_configuration["API"]}/org/find/allv2";
|
||||||
var apiKey = _configuration["API_KEY"];
|
var apiKey = _configuration["API_KEY"];
|
||||||
var body = new
|
var body = new
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -2241,7 +2241,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
|
|
||||||
var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate()}";
|
var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate()}";
|
||||||
var org = _userProfileRepository.GetOc(Guid.Parse(req.nodeId), req.node, AccessToken);
|
var org = _userProfileRepository.GetOc(Guid.Parse(req.nodeId), req.node, AccessToken);
|
||||||
var organizationName = $"{(!string.IsNullOrEmpty(org.Child4) ? org.Child4 + "/" : "")}{(!string.IsNullOrEmpty(org.Child3) ? org.Child3 + "/" : "")}{(!string.IsNullOrEmpty(org.Child2) ? org.Child2 + "/" : "")}{(!string.IsNullOrEmpty(org.Child1) ? org.Child1 + "/" : "")}{org.Root ?? ""}";
|
var organizationName = org == null ? "" : $"{(!string.IsNullOrEmpty(org.Child4) ? org.Child4 + "/" : "")}{(!string.IsNullOrEmpty(org.Child3) ? org.Child3 + "/" : "")}{(!string.IsNullOrEmpty(org.Child2) ? org.Child2 + "/" : "")}{(!string.IsNullOrEmpty(org.Child1) ? org.Child1 + "/" : "")}{org.Root ?? ""}";
|
||||||
var dateTimeStamp = $"ประจำ ณ วัน{req.StartDate.Date.GetThaiDayOfWeek()} ที่ {req.StartDate.Date.ToThaiShortDate()}{enddate}";
|
var dateTimeStamp = $"ประจำ ณ วัน{req.StartDate.Date.GetThaiDayOfWeek()} ที่ {req.StartDate.Date.ToThaiShortDate()}{enddate}";
|
||||||
|
|
||||||
var templatePath = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", "TimeStampRecords.xlsx");
|
var templatePath = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", "TimeStampRecords.xlsx");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue