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

add field commandDate & education

Browse source
This commit is contained in:
Bright 2024-11-08 14:02:37 +07:00
parent 52e993d0e6
commit f792fd713a
4 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -950,6 +950,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "", p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(), AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
RemarkHorizontal = r.RemarkHorizontal, RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical, RemarkVertical = r.RemarkVertical,
}).ToList(); }).ToList();
@ -975,6 +976,7 @@ namespace BMA.EHR.Placement.Service.Controllers
NewPositionNumber = _null, NewPositionNumber = _null,
NewSalary = _null, NewSalary = _null,
AppointDate = _null, AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null, RemarkHorizontal = _null,
RemarkVertical = _null, RemarkVertical = _null,
}); });

2
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -826,6 +826,7 @@ namespace BMA.EHR.Placement.Service.Controllers
Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
ReceiveOrganizationName = p.Organization == null ? "-" : p.Organization, ReceiveOrganizationName = p.Organization == null ? "-" : p.Organization,
ActiveDate = p.Date == null ? "-" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(), ActiveDate = p.Date == null ? "-" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(),
CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
Reason = p.Reason ?? "-", Reason = p.Reason ?? "-",
RemarkHorizontal = r.RemarkHorizontal, RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical, RemarkVertical = r.RemarkVertical,
@ -848,6 +849,7 @@ namespace BMA.EHR.Placement.Service.Controllers
Salary = _null, Salary = _null,
ReceiveOrganizationName = _null, ReceiveOrganizationName = _null,
ActiveDate = _null, ActiveDate = _null,
CommandExcecuteDate = _null,
Reason = _null, Reason = _null,
RemarkHorizontal = _null, RemarkHorizontal = _null,
RemarkVertical = _null, RemarkVertical = _null,

1
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -402,6 +402,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementOther.OrganizationPositionOld = org.result.position + "-" + retirementOther.OrganizationOld; retirementOther.OrganizationPositionOld = org.result.position + "-" + retirementOther.OrganizationOld;
retirementOther.EducationOld = org.result.education;
} }
await _context.RetirementOthers.AddAsync(retirementOther); await _context.RetirementOthers.AddAsync(retirementOther);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();

1
BMA.EHR.Retirement.Service/Requests/OrgRequest.cs
View file

@ -44,5 +44,6 @@ namespace BMA.EHR.Retirement.Service.Requests
public string? posExecutiveName { get; set; } public string? posExecutiveName { get; set; }
public string? posNo { get; set; } public string? posNo { get; set; }
public DateTime? leaveDate { get; set; } public DateTime? leaveDate { get; set; }
public string? education { get; set; }
} }
} }