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

รับโอนเพิ่มidตำแหน่ง

Browse source
This commit is contained in:
Kittapath 2023-08-07 16:26:29 +07:00
parent 3d0a56d277
commit 5843cc8146
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -80,6 +80,13 @@ namespace BMA.EHR.Placement.Service.Controllers
PositionType = p.PositionType == null ? null : p.PositionType.Name, PositionType = p.PositionType == null ? null : p.PositionType.Name,
PositionLine = p.PositionLine == null ? null : p.PositionLine.Name, PositionLine = p.PositionLine == null ? null : p.PositionLine.Name,
PositionLevel = p.PositionLevel == null ? null : p.PositionLevel.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.IsActive,
p.CreatedAt, p.CreatedAt,
}) })
@ -121,13 +128,13 @@ namespace BMA.EHR.Placement.Service.Controllers
p.TelephoneNumber, p.TelephoneNumber,
p.Status, p.Status,
p.RecruitDate, p.RecruitDate,
PositionNumber = p.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionNumber.Id, PosNoId = 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, PositionId = 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, PositionPathSideId = 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, PositionTypeId = 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, PositionLineId = 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, PositionLevelId = 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, OrganizationPositionId = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id,
p.CreatedAt, p.CreatedAt,
PlacementReceiveDocs = p.PlacementReceiveDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), 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.TelephoneNumber,
data.Status, data.Status,
data.RecruitDate, data.RecruitDate,
data.PositionNumber, data.PosNoId,
data.PositionPath, data.PositionId,
data.PositionPathSide, data.PositionPathSideId,
data.PositionType, data.PositionTypeId,
data.PositionLine, data.PositionLineId,
data.PositionLevel, data.PositionLevelId,
data.OrganizationPosition, data.OrganizationPositionId,
data.CreatedAt, data.CreatedAt,
Docs = placementReceiveDocs, Docs = placementReceiveDocs,
}; };
@ -268,10 +275,6 @@ namespace BMA.EHR.Placement.Service.Controllers
.FirstOrDefaultAsync(x => x.Id == id); .FirstOrDefaultAsync(x => x.Id == id);
if (uppdated == null) if (uppdated == null)
return Error(GlobalMessages.PlacementReceiveNotFound, 404); 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) if (req.PosNoId != null)
{ {
var save_posNo = await _context.PositionNumbers.FindAsync(req.PosNoId); var save_posNo = await _context.PositionNumbers.FindAsync(req.PosNoId);