From 5843cc8146636e6e5f9342a4d2ab7ec625da8656 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Mon, 7 Aug 2023 16:26:29 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=82=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1id?= =?UTF-8?q?=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementReceiveController.cs | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 01d8b7b8..2140a7eb 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -80,6 +80,13 @@ namespace BMA.EHR.Placement.Service.Controllers PositionType = p.PositionType == null ? null : p.PositionType.Name, PositionLine = p.PositionLine == null ? null : p.PositionLine.Name, PositionLevel = p.PositionLevel == null ? null : p.PositionLevel.Name, + PosNoId = p.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionNumber.Id, + PositionId = p.PositionPath == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionPath.Id, + PositionPathSideId = p.PositionPathSide == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionPathSide.Id, + PositionTypeId = p.PositionType == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionType.Id, + PositionLineId = p.PositionLine == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLine.Id, + PositionLevelId = p.PositionLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLevel.Id, + OrganizationPositionId = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id, p.IsActive, p.CreatedAt, }) @@ -121,13 +128,13 @@ namespace BMA.EHR.Placement.Service.Controllers p.TelephoneNumber, p.Status, p.RecruitDate, - PositionNumber = p.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionNumber.Id, - PositionPath = p.PositionPath == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionPath.Id, - PositionPathSide = p.PositionPathSide == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionPathSide.Id, - PositionType = p.PositionType == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionType.Id, - PositionLine = p.PositionLine == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLine.Id, - PositionLevel = p.PositionLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLevel.Id, - OrganizationPosition = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id, + PosNoId = p.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionNumber.Id, + PositionId = p.PositionPath == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionPath.Id, + PositionPathSideId = p.PositionPathSide == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionPathSide.Id, + PositionTypeId = p.PositionType == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionType.Id, + PositionLineId = p.PositionLine == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLine.Id, + PositionLevelId = p.PositionLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLevel.Id, + OrganizationPositionId = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id, p.CreatedAt, PlacementReceiveDocs = p.PlacementReceiveDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), }) @@ -162,13 +169,13 @@ namespace BMA.EHR.Placement.Service.Controllers data.TelephoneNumber, data.Status, data.RecruitDate, - data.PositionNumber, - data.PositionPath, - data.PositionPathSide, - data.PositionType, - data.PositionLine, - data.PositionLevel, - data.OrganizationPosition, + data.PosNoId, + data.PositionId, + data.PositionPathSideId, + data.PositionTypeId, + data.PositionLineId, + data.PositionLevelId, + data.OrganizationPositionId, data.CreatedAt, Docs = placementReceiveDocs, }; @@ -268,10 +275,6 @@ namespace BMA.EHR.Placement.Service.Controllers .FirstOrDefaultAsync(x => x.Id == id); if (uppdated == null) return Error(GlobalMessages.PlacementReceiveNotFound, 404); - var organization = await _context.Organizations - .FirstOrDefaultAsync(x => x.Id == id); - if (organization == null) - return Error(GlobalMessages.OrganizationNotFound, 404); if (req.PosNoId != null) { var save_posNo = await _context.PositionNumbers.FindAsync(req.PosNoId);