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

Merge branch 'develop' into develop-Bright

Browse source
This commit is contained in:
Bright 2024-10-10 13:46:34 +07:00
commit 1c7b3b1c6c
2 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1242,7 +1242,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var placementProfiles = await _context.PlacementAppointments var placementProfiles = await _context.PlacementAppointments
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.type == "EMPLOYEE") // .Where(x => x.type == "EMPLOYEE")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT"); placementProfiles.ForEach(profile => profile.Status = "REPORT");
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
@ -1262,7 +1262,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var placementProfiles = await _context.PlacementAppointments var placementProfiles = await _context.PlacementAppointments
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.type == "EMPLOYEE") // .Where(x => x.type == "EMPLOYEE")
.Where(x => x.Status.ToUpper() == "REPORT") .Where(x => x.Status.ToUpper() == "REPORT")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "PENDING"); placementProfiles.ForEach(profile => profile.Status = "PENDING");
@ -1290,7 +1290,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var report_data = (from p in _context.PlacementAppointments var report_data = (from p in _context.PlacementAppointments
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.Where(x => x.type == "EMPLOYEE") // .Where(x => x.type == "EMPLOYEE")
.ToList() .ToList()
join r in req.refIds join r in req.refIds
on p.Id.ToString() equals r.refId on p.Id.ToString() equals r.refId
@ -1399,7 +1399,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var placementProfiles = await _context.PlacementAppointments var placementProfiles = await _context.PlacementAppointments
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.type == "EMPLOYEE") // .Where(x => x.type == "EMPLOYEE")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT"); placementProfiles.ForEach(profile => profile.Status = "REPORT");
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
@ -1419,7 +1419,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var placementProfiles = await _context.PlacementAppointments var placementProfiles = await _context.PlacementAppointments
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.type == "EMPLOYEE") // .Where(x => x.type == "EMPLOYEE")
.Where(x => x.Status.ToUpper() == "REPORT") .Where(x => x.Status.ToUpper() == "REPORT")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "PENDING"); placementProfiles.ForEach(profile => profile.Status = "PENDING");
@ -1447,7 +1447,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var report_data = (from p in _context.PlacementAppointments var report_data = (from p in _context.PlacementAppointments
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.Where(x => x.type == "EMPLOYEE") // .Where(x => x.type == "EMPLOYEE")
.ToList() .ToList()
join r in req.refIds join r in req.refIds
on p.Id.ToString() equals r.refId on p.Id.ToString() equals r.refId

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

@ -1479,11 +1479,11 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> PostReportRecruit([FromBody] ReportPersonRequest req) public async Task<ActionResult<ResponseObject>> PostReportRecruit([FromBody] ReportPersonRequest req)
{ {
var placementProfiles = await _context.PlacementProfiles var placementProfiles = await _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.ThenInclude(x => x.PlacementType) // .ThenInclude(x => x.PlacementType)
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT");
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
@ -1529,11 +1529,11 @@ namespace BMA.EHR.Placement.Service.Controllers
try try
{ {
var report_data = (from p in _context.PlacementProfiles var report_data = (from p in _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.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()))
.Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED")
.ToList() .ToList()
join r in req.refIds join r in req.refIds
on p.Id.ToString() equals r.refId on p.Id.ToString() equals r.refId
@ -1735,11 +1735,11 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> PostReportCandidate([FromBody] ReportPersonRequest req) public async Task<ActionResult<ResponseObject>> PostReportCandidate([FromBody] ReportPersonRequest req)
{ {
var placementProfiles = await _context.PlacementProfiles var placementProfiles = await _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.ThenInclude(x => x.PlacementType) // .ThenInclude(x => x.PlacementType)
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT");
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
@ -1785,11 +1785,11 @@ namespace BMA.EHR.Placement.Service.Controllers
try try
{ {
var report_data = (from p in _context.PlacementProfiles var report_data = (from p in _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.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()))
.Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED")
.ToList() .ToList()
join r in req.refIds join r in req.refIds
on p.Id.ToString() equals r.refId on p.Id.ToString() equals r.refId
@ -1991,11 +1991,11 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> PostReportAppoint([FromBody] ReportPersonRequest req) public async Task<ActionResult<ResponseObject>> PostReportAppoint([FromBody] ReportPersonRequest req)
{ {
var placementProfiles = await _context.PlacementProfiles var placementProfiles = await _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.ThenInclude(x => x.PlacementType) // .ThenInclude(x => x.PlacementType)
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ") // .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT");
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
@ -2041,11 +2041,11 @@ namespace BMA.EHR.Placement.Service.Controllers
try try
{ {
var report_data = (from p in _context.PlacementProfiles var report_data = (from p in _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.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()))
.Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ") // .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN")
.ToList() .ToList()
join r in req.refIds join r in req.refIds
on p.Id.ToString() equals r.refId on p.Id.ToString() equals r.refId
@ -2167,11 +2167,11 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> PostReportMove([FromBody] ReportPersonRequest req) public async Task<ActionResult<ResponseObject>> PostReportMove([FromBody] ReportPersonRequest req)
{ {
var placementProfiles = await _context.PlacementProfiles var placementProfiles = await _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.ThenInclude(x => x.PlacementType) // .ThenInclude(x => x.PlacementType)
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.Placement!.PlacementType!.Name == "ย้ายข้าราชการ") // .Where(x => x.Placement!.PlacementType!.Name == "ย้ายข้าราชการ")
.Where(x => x.typeCommand.Trim().ToUpper() == "MOVE") // .Where(x => x.typeCommand.Trim().ToUpper() == "MOVE")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT");
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
@ -2217,11 +2217,11 @@ namespace BMA.EHR.Placement.Service.Controllers
try try
{ {
var report_data = (from p in _context.PlacementProfiles var report_data = (from p in _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.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()))
.Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ") // .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN")
.ToList() .ToList()
join r in req.refIds join r in req.refIds
on p.Id.ToString() equals r.refId on p.Id.ToString() equals r.refId
@ -2341,11 +2341,11 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> PostReportSlip([FromBody] ReportPersonRequest req) public async Task<ActionResult<ResponseObject>> PostReportSlip([FromBody] ReportPersonRequest req)
{ {
var placementProfiles = await _context.PlacementProfiles var placementProfiles = await _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.ThenInclude(x => x.PlacementType) // .ThenInclude(x => x.PlacementType)
.Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => req.refIds.Contains(x.Id.ToString()))
.Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ") // .Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ")
.Where(x => x.typeCommand.Trim().ToUpper() == "SLIP") // .Where(x => x.typeCommand.Trim().ToUpper() == "SLIP")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT");
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
@ -2391,11 +2391,11 @@ namespace BMA.EHR.Placement.Service.Controllers
try try
{ {
var report_data = (from p in _context.PlacementProfiles var report_data = (from p in _context.PlacementProfiles
.Include(x => x.Placement) // .Include(x => x.Placement)
.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()))
.Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ") // .Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ")
.Where(x => x.typeCommand.Trim().ToUpper() == "SLIP") // .Where(x => x.typeCommand.Trim().ToUpper() == "SLIP")
.ToList() .ToList()
join r in req.refIds join r in req.refIds
on p.Id.ToString() equals r.refId on p.Id.ToString() equals r.refId