Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 11s

This commit is contained in:
Suphonchai Phoonsawat 2025-05-28 16:00:43 +07:00
commit dc2603d107
3 changed files with 5 additions and 2 deletions

View file

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

View file

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

View file

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