From c8b5c6eaa97e9eec0b340374d506fab7a21dcd4f Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 10 Oct 2024 12:33:26 +0700 Subject: [PATCH] no message --- .../PlacementAppointmentController.cs | 12 +-- .../Controllers/PlacementController.cs | 80 +++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 22c0a386..4114a456 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -1242,7 +1242,7 @@ namespace BMA.EHR.Placement.Service.Controllers { var placementProfiles = await _context.PlacementAppointments .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.type == "EMPLOYEE") + // .Where(x => x.type == "EMPLOYEE") .ToListAsync(); placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); @@ -1262,7 +1262,7 @@ namespace BMA.EHR.Placement.Service.Controllers { var placementProfiles = await _context.PlacementAppointments .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.type == "EMPLOYEE") + // .Where(x => x.type == "EMPLOYEE") .Where(x => x.Status.ToUpper() == "REPORT") .ToListAsync(); placementProfiles.ForEach(profile => profile.Status = "PENDING"); @@ -1290,7 +1290,7 @@ namespace BMA.EHR.Placement.Service.Controllers { var report_data = (from p in _context.PlacementAppointments .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) - .Where(x => x.type == "EMPLOYEE") + // .Where(x => x.type == "EMPLOYEE") .ToList() join r in req.refIds on p.Id.ToString() equals r.refId @@ -1399,7 +1399,7 @@ namespace BMA.EHR.Placement.Service.Controllers { var placementProfiles = await _context.PlacementAppointments .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.type == "EMPLOYEE") + // .Where(x => x.type == "EMPLOYEE") .ToListAsync(); placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); @@ -1419,7 +1419,7 @@ namespace BMA.EHR.Placement.Service.Controllers { var placementProfiles = await _context.PlacementAppointments .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.type == "EMPLOYEE") + // .Where(x => x.type == "EMPLOYEE") .Where(x => x.Status.ToUpper() == "REPORT") .ToListAsync(); placementProfiles.ForEach(profile => profile.Status = "PENDING"); @@ -1447,7 +1447,7 @@ namespace BMA.EHR.Placement.Service.Controllers { var report_data = (from p in _context.PlacementAppointments .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) - .Where(x => x.type == "EMPLOYEE") + // .Where(x => x.type == "EMPLOYEE") .ToList() join r in req.refIds on p.Id.ToString() equals r.refId diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 56d6394a..2b21d27e 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1479,11 +1479,11 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> PostReportRecruit([FromBody] ReportPersonRequest req) { var placementProfiles = await _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .ThenInclude(x => x.PlacementType) .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") - .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") + // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") + // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") .ToListAsync(); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); await _context.SaveChangesAsync(); @@ -1529,11 +1529,11 @@ namespace BMA.EHR.Placement.Service.Controllers try { var report_data = (from p in _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .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() == "APPOINTED") + // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") + // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") .ToList() join r in req.refIds on p.Id.ToString() equals r.refId @@ -1924,11 +1924,11 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> PostReportCandidate([FromBody] ReportPersonRequest req) { var placementProfiles = await _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .ThenInclude(x => x.PlacementType) .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") - .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") + // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") + // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") .ToListAsync(); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); await _context.SaveChangesAsync(); @@ -1974,11 +1974,11 @@ namespace BMA.EHR.Placement.Service.Controllers try { var report_data = (from p in _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .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() == "APPOINTED") + // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") + // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") .ToList() join r in req.refIds on p.Id.ToString() equals r.refId @@ -2369,11 +2369,11 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> PostReportAppoint([FromBody] ReportPersonRequest req) { var placementProfiles = await _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .ThenInclude(x => x.PlacementType) .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ") - .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") + // .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ") + // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") .ToListAsync(); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); await _context.SaveChangesAsync(); @@ -2419,11 +2419,11 @@ namespace BMA.EHR.Placement.Service.Controllers try { var report_data = (from p in _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .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() == "APPOIN") + // .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ") + // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") .ToList() join r in req.refIds on p.Id.ToString() equals r.refId @@ -2545,11 +2545,11 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> PostReportMove([FromBody] ReportPersonRequest req) { var placementProfiles = await _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .ThenInclude(x => x.PlacementType) .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.Placement!.PlacementType!.Name == "ย้ายข้าราชการ") - .Where(x => x.typeCommand.Trim().ToUpper() == "MOVE") + // .Where(x => x.Placement!.PlacementType!.Name == "ย้ายข้าราชการ") + // .Where(x => x.typeCommand.Trim().ToUpper() == "MOVE") .ToListAsync(); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); await _context.SaveChangesAsync(); @@ -2595,11 +2595,11 @@ namespace BMA.EHR.Placement.Service.Controllers try { var report_data = (from p in _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .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() == "APPOIN") + // .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ") + // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") .ToList() join r in req.refIds on p.Id.ToString() equals r.refId @@ -2719,11 +2719,11 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> PostReportSlip([FromBody] ReportPersonRequest req) { var placementProfiles = await _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .ThenInclude(x => x.PlacementType) .Where(x => req.refIds.Contains(x.Id.ToString())) - .Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ") - .Where(x => x.typeCommand.Trim().ToUpper() == "SLIP") + // .Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ") + // .Where(x => x.typeCommand.Trim().ToUpper() == "SLIP") .ToListAsync(); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); await _context.SaveChangesAsync(); @@ -2769,11 +2769,11 @@ namespace BMA.EHR.Placement.Service.Controllers try { var report_data = (from p in _context.PlacementProfiles - .Include(x => x.Placement) - .ThenInclude(x => x.PlacementType) + // .Include(x => x.Placement) + // .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") + // .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