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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
kittapath 2024-11-08 13:36:53 +07:00
commit 52e993d0e6
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -441,7 +441,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementAppointment.posTypeNameOld = org.result.posTypeName; placementAppointment.posTypeNameOld = org.result.posTypeName;
placementAppointment.posLevelOldId = org.result.posLevelId; placementAppointment.posLevelOldId = org.result.posLevelId;
placementAppointment.posLevelNameOld = org.result.posLevelName; placementAppointment.posLevelNameOld = org.result.posLevelName;
placementAppointment.EducationOld = org.result.education;
// placementAppointment.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}"; // placementAppointment.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}";
// placementAppointment.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount; // placementAppointment.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount;
@ -1588,7 +1588,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
try try
{ {
var report_data = (from p in _context.PlacementAppointments var report_data = (from p in _context.PlacementAppointments
//.Include(x => x.PlacementEducation) //.Include(x => x.PlacementEducation)
// .ThenInclude(x => x.PlacementType) // .ThenInclude(x => x.PlacementType)
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
@ -1645,6 +1645,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();
@ -1671,6 +1672,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,
}); });

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

@ -41,6 +41,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelId { get; set; } public string? posLevelId { get; set; }
public string? posLevelName { get; set; } public string? posLevelName { get; set; }
public double? salary { get; set; } public double? salary { get; set; }
public string? education { get; set; }
} }
} }

1
BMA.EHR.Placement.Service/Requests/ReportAttachmentRequest.cs
View file

@ -21,5 +21,6 @@ namespace BMA.EHR.Placement.Service.Requests
public string? RemarkHorizontal { get; set; } public string? RemarkHorizontal { get; set; }
public string? RemarkVertical { get; set; } public string? RemarkVertical { get; set; }
public int CommandYear { get; set; } public int CommandYear { get; set; }
public DateTime? CommandExcecuteDate { get; set; }
} }
} }