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

add edu placement
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
kittapath 2025-01-07 00:00:56 +07:00
parent 564a23988d
commit 910dc53808
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -341,7 +341,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.CreatedAt,
data.Reason,
educationOld = data.EducationOld == "/" || data.EducationOld == null ? null : data.EducationOld,
data.EducationOld,
data.salary,
data.PositionTypeOld,
data.PositionLevelOld,
@ -844,7 +844,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,
@ -1056,7 +1057,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,
@ -1265,7 +1267,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,
@ -1470,7 +1473,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,
@ -1618,13 +1622,13 @@ namespace BMA.EHR.Placement.Service.Controllers
{
try
{
var report_data = (from p in _context.PlacementAppointments
//.Include(x => x.PlacementEducation)
// .ThenInclude(x => x.PlacementType)
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
// .Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ")
// .Where(x => x.typeCommand.Trim().ToUpper() == "SLIP")
.ToList()
var report_data = (from p in _context.PlacementAppointments
//.Include(x => x.PlacementEducation)
// .ThenInclude(x => x.PlacementType)
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
// .Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ")
// .Where(x => x.typeCommand.Trim().ToUpper() == "SLIP")
.ToList()
join r in req.refIds
on p.Id.ToString() equals r.refId
orderby r.Sequence
@ -1686,7 +1690,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,

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

@ -335,7 +335,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.CreatedAt,
data.Reason,
educationOld = data.EducationOld == "/" || data.EducationOld == null ? null : data.EducationOld,
data.EducationOld,
data.AmountOld,
data.PositionOld,
organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld,
@ -488,7 +488,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.posLevelOldId = org.result.posLevelId;
placementReceive.posLevelNameOld = org.result.posLevelName;
// placementReceive.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}";
placementReceive.EducationOld = org.result.education;
placementReceive.AmountOld = org.result.Amount;
placementReceive.PositionOld = org.result.position;