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

fix issue : ระบบการลา>>สังกัด ฝ่าย (เอา / ออก เปลี่ยนเป็นว่าง) #1131

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-01-30 11:43:36 +07:00
parent 339de6132e
commit 177cefcccc
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1827,15 +1827,18 @@ namespace BMA.EHR.Leave.Service.Controllers
//var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category); //var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
//var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category); //var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
// fix issue : ระบบการลา>>สังกัด ฝ่าย (เอา / ออก เปลี่ยนเป็นว่าง) #1131
var orgName = rawData.Root ?? ""; var orgName = rawData.Root ?? "";
if (rawData.Child1 != null && rawData.Child1 != "") if (rawData.Child1 != null && rawData.Child1 != "")
orgName += $"/{rawData.Child1}"; orgName += $" {rawData.Child1}";
if (rawData.Child2 != null && rawData.Child2 != "") if (rawData.Child2 != null && rawData.Child2 != "")
orgName += $"/{rawData.Child2}"; orgName += $" {rawData.Child2}";
if (rawData.Child3 != null && rawData.Child3 != "") if (rawData.Child3 != null && rawData.Child3 != "")
orgName += $"/{rawData.Child3}"; orgName += $" {rawData.Child3}";
if (rawData.Child4 != null && rawData.Child4 != "") if (rawData.Child4 != null && rawData.Child4 != "")
orgName += $"/{rawData.Child4}"; orgName += $" {rawData.Child4}";
var result = new GetLeaveRequestForAdminByIdDto var result = new GetLeaveRequestForAdminByIdDto
{ {

10
BMA.EHR.Retirement.Service/Program.cs
View file

@ -82,15 +82,14 @@ var builder = WebApplication.CreateBuilder(args);
.SetIsOriginAllowedToAllowWildcardSubdomains(); .SetIsOriginAllowedToAllowWildcardSubdomains();
})); }));
builder.Services.AddHttpClient();
// Add services to the container. // Add services to the container.
builder.Services.AddApplication(); builder.Services.AddApplication();
builder.Services.AddPersistence(builder.Configuration);
builder.Services.AddLeaveApplication(); builder.Services.AddLeaveApplication();
builder.Services.AddPersistence(builder.Configuration);
builder.Services.AddLeavePersistence(builder.Configuration); builder.Services.AddLeavePersistence(builder.Configuration);
builder.Services.AddHttpClient();
builder.Services.AddControllers(options => builder.Services.AddControllers(options =>
{ {
options.SuppressAsyncSuffixInActionNames = false; options.SuppressAsyncSuffixInActionNames = false;
@ -110,6 +109,7 @@ var builder = WebApplication.CreateBuilder(args);
options.UseMySql(disciplineConnection, ServerVersion.AutoDetect(disciplineConnection))); options.UseMySql(disciplineConnection, ServerVersion.AutoDetect(disciplineConnection)));
builder.Services.AddHealthChecks(); builder.Services.AddHealthChecks();
// Add Hangfire services. // Add Hangfire services.
builder.Services.AddHangfire(configuration => configuration builder.Services.AddHangfire(configuration => configuration
.SetDataCompatibilityLevel(CompatibilityLevel.Version_170) .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
@ -161,10 +161,12 @@ var app = builder.Build();
app.UseStaticFiles(); app.UseStaticFiles();
app.MapControllers(); app.MapControllers();
app.UseMiddleware<ErrorHandlerMiddleware>(); app.UseMiddleware<ErrorHandlerMiddleware>();
app.UseHangfireDashboard("/hangfire", new DashboardOptions() app.UseHangfireDashboard("/hangfire", new DashboardOptions()
{ {
Authorization = new[] { new CustomAuthorizeFilter() } Authorization = new[] { new CustomAuthorizeFilter() }
}); });
var manager = new RecurringJobManager(); var manager = new RecurringJobManager();
if (manager != null) if (manager != null)
{ {