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

แก้บรรจุผูกกับโครงสร้างใหม่

Browse source
This commit is contained in:
Kittapath 2024-02-22 10:40:24 +07:00
parent 06af1fc632
commit adada88230
6 changed files with 17266 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

46
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -114,10 +114,12 @@ namespace BMA.EHR.Placement.Service.Controllers
ProfilePhoto = x.Id,
PositionCandidate = x.PositionCandidate == null ? null : x.PositionCandidate.Name,
PositionCandidateId = x.PositionCandidate == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionCandidate.Id,
OrganizationName = x.OrganizationPosition == null ? null : (x.OrganizationPosition.Organization == null ? null : (x.OrganizationPosition.Organization.OrganizationOrganization == null ? null : x.OrganizationPosition.Organization.OrganizationOrganization.Name)),////
// OrganizationName = x.OrganizationPosition == null ? null : (x.OrganizationPosition.Organization == null ? null : (x.OrganizationPosition.Organization.OrganizationOrganization == null ? null : x.OrganizationPosition.Organization.OrganizationOrganization.Name)),////
OrganizationShortName = x.OrganizationPosition == null ? null : (x.OrganizationPosition.Organization == null ? null : (x.OrganizationPosition.Organization.OrganizationShortName == null ? null : x.OrganizationPosition.Organization.OrganizationShortName.Name)),////
PositionNumber = x.PositionNumber == null ? null : x.PositionNumber.Name,
PositionPath = x.PositionPath == null ? null : x.PositionPath.Name,
PosNumber = x.PosNumber,
PosPath = x.PosPath,
organizationName = x.organizationName,
orgTreeShortName = x.orgTreeShortName,
ReportingDate = x.ReportingDate,
BmaOfficer = x.IsOfficer,
StatusId = x.PlacementStatus,
@ -132,7 +134,7 @@ namespace BMA.EHR.Placement.Service.Controllers
ContainDate = x.RecruitDate,
OrganizationPositionId = x.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationPosition.Id,
PosNoId = x.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionNumber.Id,
// PosNoId = x.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionNumber.Id,
// PositionId = x.PositionPath == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionPath.Id,
PositionLevelId = x.PositionLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionLevel.Id,
PositionLineId = x.PositionLine == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionLine.Id,
@ -155,10 +157,12 @@ namespace BMA.EHR.Placement.Service.Controllers
p.ProfilePhoto,
p.PositionCandidate,
p.PositionCandidateId,
p.OrganizationName,
// p.OrganizationName,
p.OrganizationShortName,
p.PositionNumber,
p.PositionPath,
p.PosNumber,
p.PosPath,
p.organizationName,
p.orgTreeShortName,
p.ReportingDate,
BmaOfficer = await _documentService.CheckBmaOfficer(p.IdCard),
p.StatusId,
@ -168,7 +172,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.ContainDate,
p.OrganizationPositionId,
p.PosNoId,
// p.PosNoId,
// p.PositionId,
p.PositionLevelId,
p.PositionLineId,
@ -208,10 +212,12 @@ namespace BMA.EHR.Placement.Service.Controllers
ProfilePhoto = x.Id,
PositionCandidate = x.PositionCandidate == null ? null : x.PositionCandidate.Name,
PositionCandidateId = x.PositionCandidate == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionCandidate.Id,
OrganizationName = x.OrganizationPosition == null ? null : (x.OrganizationPosition.Organization == null ? null : (x.OrganizationPosition.Organization.OrganizationOrganization == null ? null : x.OrganizationPosition.Organization.OrganizationOrganization.Name)),////
// OrganizationName = x.OrganizationPosition == null ? null : (x.OrganizationPosition.Organization == null ? null : (x.OrganizationPosition.Organization.OrganizationOrganization == null ? null : x.OrganizationPosition.Organization.OrganizationOrganization.Name)),////
OrganizationShortName = x.OrganizationPosition == null ? null : (x.OrganizationPosition.Organization == null ? null : (x.OrganizationPosition.Organization.OrganizationShortName == null ? null : x.OrganizationPosition.Organization.OrganizationShortName.Name)),////
PositionNumber = x.PositionNumber == null ? null : x.PositionNumber.Name,
PositionPath = x.PositionPath == null ? null : x.PositionPath.Name,
PosNumber = x.PosNumber,
PosPath = x.PosPath,
organizationName = x.organizationName,
orgTreeShortName = x.orgTreeShortName,
ReportingDate = x.ReportingDate,
BmaOfficer = x.IsOfficer,
StatusId = x.PlacementStatus,
@ -226,7 +232,7 @@ namespace BMA.EHR.Placement.Service.Controllers
ContainDate = x.RecruitDate,
OrganizationPositionId = x.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationPosition.Id,
PosNoId = x.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionNumber.Id,
// PosNoId = x.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionNumber.Id,
// PositionId = x.PositionPath == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionPath.Id,
PositionLevelId = x.PositionLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionLevel.Id,
PositionLineId = x.PositionLine == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionLine.Id,
@ -248,10 +254,12 @@ namespace BMA.EHR.Placement.Service.Controllers
p.ProfilePhoto,
p.PositionCandidate,
p.PositionCandidateId,
p.OrganizationName,
// p.OrganizationName,
p.OrganizationShortName,
p.PositionNumber,
p.PositionPath,
p.PosNumber,
p.PosPath,
p.organizationName,
p.orgTreeShortName,
p.ReportingDate,
BmaOfficer = await _documentService.CheckBmaOfficer(p.IdCard),
p.StatusId,
@ -261,7 +269,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.ContainDate,
p.OrganizationPositionId,
p.PosNoId,
// p.PosNoId,
// p.PositionId,
p.PositionLevelId,
p.PositionLineId,
@ -717,6 +725,10 @@ namespace BMA.EHR.Placement.Service.Controllers
// person.PositionType = save;
// }
person.Draft = false;
person.organizationName = req.organizationName;
person.orgTreeShortName = req.orgTreeShortName;
person.PosPath = req.posPath;
person.PosNumber = req.posNumber;
person.node = req.node;
person.nodeId = req.nodeId;
person.posmasterId = req.posmasterId;
@ -1107,7 +1119,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{
var position = await _context.PlacementProfiles
.Where(x => x.PositionNumber != null)
.Select(x => x.PositionNumber.Id)
.Select(x => x.PositionNumber)
.ToListAsync();
return Success(position);

4
BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs
View file

@ -18,6 +18,10 @@ namespace BMA.EHR.Placement.Service.Requests
public double? MouthSalaryAmount { get; set; }
public double? PositionSalaryAmount { get; set; }
public string? organizationName { get; set; }
public string? orgTreeShortName { get; set; }
public string? posPath { get; set; }
public int? posNumber { get; set; }
public int? node { get; set; }
public Guid? nodeId { get; set; }
public Guid? posmasterId { get; set; }