From 08fd49a8d07adcaa69b9d4dc3b20688344c7977d Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 8 Sep 2023 16:41:23 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A0=E0=B8=97=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20=E0=B9=83?= =?UTF-8?q?=E0=B8=99=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlacementAppointmentController.cs | 3 +++ .../Controllers/RetirementOtherController.cs | 3 +++ .../Controllers/RetirementResignController.cs | 18 ++++-------------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 919dac3a..5161b5f9 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -101,6 +101,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.PositionNumberOld, p.OrganizationPositionOld, p.CreatedAt, + CommandType = p.CommandType == null ? null : p.CommandType.Name, }) .ToListAsync(); if (PlacementAdmin == true) @@ -161,6 +162,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.PositionDate, PlacementAppointmentDocs = p.PlacementAppointmentDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, + CommandType = p.CommandType == null ? null : p.CommandType.Name, }) .FirstOrDefaultAsync(); if (data == null) @@ -214,6 +216,7 @@ namespace BMA.EHR.Placement.Service.Controllers data.PositionDate, Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), Docs = placementAppointmentDocs, + data.CommandType, }; return Success(_data); diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index e9d31067..b4208c72 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -101,6 +101,7 @@ namespace BMA.EHR.Retirement.Service.Controllers p.PositionNumberOld, p.OrganizationPositionOld, p.CreatedAt, + CommandType = p.CommandType == null ? null : p.CommandType.Name, }) .ToListAsync(); if (RetirementAdmin == true) @@ -161,6 +162,7 @@ namespace BMA.EHR.Retirement.Service.Controllers p.PositionDate, Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, RetirementOtherDocs = p.RetirementOtherDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), + CommandType = p.CommandType == null ? null : p.CommandType.Name, }) .FirstOrDefaultAsync(); if (data == null) @@ -214,6 +216,7 @@ namespace BMA.EHR.Retirement.Service.Controllers data.PositionDate, Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), Docs = retirementOtherDocs, + data.CommandType, }; return Success(_data); diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 137900f2..aeb3bce8 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -410,20 +410,10 @@ namespace BMA.EHR.Retirement.Service.Controllers .FirstOrDefaultAsync(x => x.Id == id); if (deleted == null) return Error(GlobalMessages.RetirementResignNotFound, 404); - var retirementResignDocs = new List(); - foreach (var doc in deleted.RetirementResignDocs) - { - if (doc.Document != null) - retirementResignDocs.Add(doc.Document.Id); - } - _context.RetirementResignDocs.RemoveRange(deleted.RetirementResignDocs); - await _context.SaveChangesAsync(); - _context.RetirementResigns.Remove(deleted); - foreach (var doc in retirementResignDocs) - { - if (doc != null) - await _documentService.DeleteFileAsync(doc); - } + deleted.Status = "DELETE"; + deleted.LastUpdateFullName = FullName ?? "System Administrator"; + deleted.LastUpdateUserId = UserId ?? ""; + deleted.LastUpdatedAt = DateTime.Now; await _context.SaveChangesAsync(); return Success(); }