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

Correct Execute Command

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-08-16 14:15:45 +07:00
parent ecf982535b
commit 0d22239a2e
1 changed files with 46 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

55
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -306,24 +306,61 @@ namespace BMA.EHR.Application.Repositories.Commands
{ {
Order = 1, Order = 1,
Date = command.CommandAffectDate, Date = command.CommandAffectDate,
Amount = placementProfile.Amount, Amount = placementProfile.Amount == null ? 0 : placementProfile.Amount,
PositionSalaryAmount = placementProfile.PositionSalaryAmount, PositionSalaryAmount = placementProfile.PositionSalaryAmount == null ? 0 : placementProfile.PositionSalaryAmount,
MouthSalaryAmount = placementProfile.MouthSalaryAmount, MouthSalaryAmount = placementProfile.MouthSalaryAmount == null ? 0 : placementProfile.MouthSalaryAmount,
SalaryClass = "",
SalaryRef = "บรรจุและแต่งตั้งผู้สอบแข่งขันได้วุฒิ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", SalaryRef = "บรรจุและแต่งตั้งผู้สอบแข่งขันได้วุฒิ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}",
OcId = oc == null ? Guid.Empty : oc.Id, OcId = oc == null ? Guid.Empty : oc.Id,
PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id,
PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id,
PositionLevel = placementProfile.PositionLevel, PositionLevel = placementProfile.PositionLevel,
PositionLineId = placementProfile.PositionLine!.Id, PositionLineId = placementProfile.PositionLine!.Id,
PositionTypeId = placementProfile.PositionType!.Id, PositionTypeId = placementProfile.PositionType!.Id,
OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id, OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id,
PosNoId = positionNumber!.Id,
CommandNo = $"{command.CommandNo}/{command.CommandYear}", CommandNo = $"{command.CommandNo}/{command.CommandYear}",
CommandTypeName = command.CommandType.Name CommandTypeName = command.CommandType.Name,
PositionEmployeeGroupId = null,
PositionEmployeeLevelId = null,
PositionEmployeePositionId = null,
PositionEmployeePositionSideId = null,
PosNoEmployee = "",
PositionPathSideId = placementProfile.PositionPathSide! == null ? null : placementProfile.PositionPathSide!.Id,
PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive! == null ? null : placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id,
PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide! == null ? null : placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id,
CreatedAt = DateTime.Now,
CreatedFullName = FullName,
CreatedUserId = UserId,
LastUpdatedAt = DateTime.Now,
LastUpdateFullName = FullName,
LastUpdateUserId = UserId,
}; };
//if (placementProfile.PositionPathSide! != null)
//{
// salary.PositionPathSideId = placementProfile.PositionPathSide!.Id;
//}
//else
//if (placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive! != null)
//{
// salary.PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id;
//}
//if (placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide! != null)
//{
// salary.PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id;
//}
// add profile position // add profile position
var profilePosition = new ProfilePosition var profilePosition = new ProfilePosition
{ {
@ -629,10 +666,10 @@ namespace BMA.EHR.Application.Repositories.Commands
{ {
// get prev record // get prev record
var prev = await _dbContext.Set<CommandReceiver>() var prev = await _dbContext.Set<CommandReceiver>()
.Include (c => c.Command) .Include(c => c.Command)
.Where(x => x.Command.Id == commandID) .Where(x => x.Command.Id == commandID)
.Where(x => x.Sequence < currentSeq) .Where(x => x.Sequence < currentSeq)
.OrderByDescending(x => x.Sequence) .OrderByDescending(x => x.Sequence)
.Take(1) .Take(1)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();