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-20 15:17:05 +07:00
parent eea8e1ff81
commit 06af1fc632
8 changed files with 34469 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,10 +125,15 @@ namespace BMA.EHR.Placement.Service.Controllers
ExamNumber = x.ExamNumber,
Deferment = x.IsRelief,
node = x.node,
nodeId = x.nodeId,
posmasterId = x.posmasterId,
positionId = x.positionId,
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,
PositionId = x.PositionPath == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionPath.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,
PositionPathSideId = x.PositionPathSide == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionPathSide.Id,
@ -164,7 +169,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.ContainDate,
p.OrganizationPositionId,
p.PosNoId,
p.PositionId,
// p.PositionId,
p.PositionLevelId,
p.PositionLineId,
p.PositionPathSideId,
@ -173,6 +178,10 @@ namespace BMA.EHR.Placement.Service.Controllers
p.MouthSalaryAmount,
p.PositionSalaryAmount,
Avatar = p.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(p.Avatar),
p.node,
p.nodeId,
p.posmasterId,
p.positionId,
};
result.Add(_data);
}
@ -210,10 +219,15 @@ namespace BMA.EHR.Placement.Service.Controllers
ExamNumber = x.ExamNumber,
Deferment = x.IsRelief,
node = x.node,
nodeId = x.nodeId,
posmasterId = x.posmasterId,
positionId = x.positionId,
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,
PositionId = x.PositionPath == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionPath.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,
PositionPathSideId = x.PositionPathSide == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.PositionPathSide.Id,
@ -248,7 +262,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.ContainDate,
p.OrganizationPositionId,
p.PosNoId,
p.PositionId,
// p.PositionId,
p.PositionLevelId,
p.PositionLineId,
p.PositionPathSideId,
@ -256,6 +270,10 @@ namespace BMA.EHR.Placement.Service.Controllers
p.SalaryAmount,
p.MouthSalaryAmount,
p.PositionSalaryAmount,
p.node,
p.nodeId,
p.posmasterId,
p.positionId,
};
result.Add(_data);
}
@ -646,64 +664,68 @@ namespace BMA.EHR.Placement.Service.Controllers
if (person.Draft == true)
return Error("ไม่สามารถแก้ไขข้อมูลนี้ได้เนื่องจากเผยแพร่ไปแล้ว");
if (req.PosNoId != null)
{
var save_posNo = await _context.PositionNumbers.FindAsync(req.PosNoId);
if (save_posNo == null)
return Error(GlobalMessages.PositionPosNoNotFound, 404);
person.PositionNumber = save_posNo;
// if (req.PosNoId != null)
// {
// var save_posNo = await _context.PositionNumbers.FindAsync(req.PosNoId);
// if (save_posNo == null)
// return Error(GlobalMessages.PositionPosNoNotFound, 404);
// person.PositionNumber = save_posNo;
var save_orgPosition = await _context.OrganizationPositions.FirstOrDefaultAsync(x => x.PositionNumber == save_posNo);
if (save_orgPosition == null)
return Error(GlobalMessages.PositionPosNoNotFound, 404);
person.OrganizationPosition = save_orgPosition;
}
// var save_orgPosition = await _context.OrganizationPositions.FirstOrDefaultAsync(x => x.PositionNumber == save_posNo);
// if (save_orgPosition == null)
// return Error(GlobalMessages.PositionPosNoNotFound, 404);
// person.OrganizationPosition = save_orgPosition;
// }
if (req.PositionId != null)
{
var save = await _context.PositionPaths.FindAsync(req.PositionId);
if (save == null)
return Error(GlobalMessages.PositionPathNotFound, 404);
person.PositionPath = save;
}
// if (req.PositionId != null)
// {
// var save = await _context.PositionPaths.FindAsync(req.PositionId);
// if (save == null)
// return Error(GlobalMessages.PositionPathNotFound, 404);
// person.PositionPath = save;
// }
if (req.PositionLevelId != null)
{
var save = await _context.PositionLevels.FindAsync(req.PositionLevelId);
if (save == null)
return Error(GlobalMessages.PositionLevelNotFound, 404);
person.PositionLevel = save;
}
// if (req.PositionLevelId != null)
// {
// var save = await _context.PositionLevels.FindAsync(req.PositionLevelId);
// if (save == null)
// return Error(GlobalMessages.PositionLevelNotFound, 404);
// person.PositionLevel = save;
// }
if (req.PositionLineId != null)
{
var save = await _context.PositionLines.FindAsync(req.PositionLineId);
if (save == null)
return Error(GlobalMessages.PositionLineNotFound, 404);
person.PositionLine = save;
}
// if (req.PositionLineId != null)
// {
// var save = await _context.PositionLines.FindAsync(req.PositionLineId);
// if (save == null)
// return Error(GlobalMessages.PositionLineNotFound, 404);
// person.PositionLine = save;
// }
if (req.PositionPathSideId != null)
{
var save = await _context.PositionPathSides.FindAsync(req.PositionPathSideId);
if (save == null)
return Error(GlobalMessages.PositionPathSideNotFound, 404);
person.PositionPathSide = save;
}
// if (req.PositionPathSideId != null)
// {
// var save = await _context.PositionPathSides.FindAsync(req.PositionPathSideId);
// if (save == null)
// return Error(GlobalMessages.PositionPathSideNotFound, 404);
// person.PositionPathSide = save;
// }
if (req.PositionTypeId != null)
{
var save = await _context.PositionTypes.FindAsync(req.PositionTypeId);
if (save == null)
return Error(GlobalMessages.PositionTypeNotFound, 404);
person.PositionType = save;
}
// if (req.PositionTypeId != null)
// {
// var save = await _context.PositionTypes.FindAsync(req.PositionTypeId);
// if (save == null)
// return Error(GlobalMessages.PositionTypeNotFound, 404);
// person.PositionType = save;
// }
person.Draft = false;
person.node = req.node;
person.nodeId = req.nodeId;
person.posmasterId = req.posmasterId;
person.positionId = req.positionId;
person.Amount = req.SalaryAmount;
person.MouthSalaryAmount = req.MouthSalaryAmount;
person.PositionSalaryAmount = req.PositionSalaryAmount;
person.RecruitDate = req.ContainDate;
person.ReportingDate = req.ContainDate;
person.RecruitDate = req.ReportingDate;
person.ReportingDate = req.ReportingDate;
person.PlacementStatus = "PREPARE-CONTAIN";
person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? "";
@ -1137,6 +1159,11 @@ namespace BMA.EHR.Placement.Service.Controllers
profile.PositionSalaryAmount = null;
profile.RecruitDate = null;
profile.ReportingDate = null;
profile.node = null;
profile.nodeId = null;
profile.posmasterId = null;
profile.positionId = null;
_context.SaveChanges();
return Success();