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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-05-28 16:00:43 +07:00
commit 6cce4c6f0e
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BMA.EHR.Application/ApplicationServicesRegistration.cs
View file

@ -23,6 +23,7 @@ namespace BMA.EHR.Application
services.AddTransient<CommandStatusRepository>(); services.AddTransient<CommandStatusRepository>();
services.AddTransient<InsigniaPeriodsRepository>(); services.AddTransient<InsigniaPeriodsRepository>();
services.AddTransient<RetirementRepository>(); services.AddTransient<RetirementRepository>();
services.AddTransient<RetirementEmployeeRepository>();
services.AddTransient<UserProfileRepository>(); services.AddTransient<UserProfileRepository>();
services.AddTransient<OrganizationCommonRepository>(); services.AddTransient<OrganizationCommonRepository>();
services.AddTransient<InboxRepository>(); services.AddTransient<InboxRepository>();

1
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -2563,6 +2563,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
if (_res.IsSuccessStatusCode) if (_res.IsSuccessStatusCode)
{ {
data.ForEach(profile => profile.Status = "DONE"); data.ForEach(profile => profile.Status = "DONE");
data.ForEach(profile => profile.RetirementResign.Status = "CANCEL");
// var _data = await _context.RetirementResigns // var _data = await _context.RetirementResigns
// .Where(x => data.Select(x => x.RetirementResign.Id).Contains(x.Id)) // .Where(x => data.Select(x => x.RetirementResign.Id).Contains(x.Id))
// .ToListAsync(); // .ToListAsync();

5
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -23,7 +23,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
[Produces("application/json")] [Produces("application/json")]
[Authorize] [Authorize]
[SwaggerTag("ระบบลาออกลูกจ้าง")] [SwaggerTag("ระบบลาออกลูกจ้าง")]
public class RetirementResignEmployeeEmployeeController : BaseController public class RetirementResignEmployeeController : BaseController
{ {
private readonly RetirementEmployeeRepository _repository; private readonly RetirementEmployeeRepository _repository;
private readonly NotificationRepository _repositoryNoti; private readonly NotificationRepository _repositoryNoti;
@ -33,7 +33,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
private readonly IConfiguration _configuration; private readonly IConfiguration _configuration;
private readonly PermissionRepository _permission; private readonly PermissionRepository _permission;
public RetirementResignEmployeeEmployeeController(RetirementEmployeeRepository repository, public RetirementResignEmployeeController(RetirementEmployeeRepository repository,
NotificationRepository repositoryNoti, NotificationRepository repositoryNoti,
ApplicationDBContext context, ApplicationDBContext context,
MinIOService documentService, MinIOService documentService,
@ -2000,6 +2000,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
if (_res.IsSuccessStatusCode) if (_res.IsSuccessStatusCode)
{ {
data.ForEach(profile => profile.Status = "DONE"); data.ForEach(profile => profile.Status = "DONE");
data.ForEach(profile => profile.RetirementResignEmployee.Status = "CANCEL");
// var _data = await _context.RetirementResignEmployees // var _data = await _context.RetirementResignEmployees
// .Where(x => data.Select(x => x.RetirementResignEmployee.Id).Contains(x.Id)) // .Where(x => data.Select(x => x.RetirementResignEmployee.Id).Contains(x.Id))
// .ToListAsync(); // .ToListAsync();