From 5ec9580e96691a570a5b2871dc5258053d2f29af Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 4 Feb 2025 11:34:02 +0700 Subject: [PATCH] =?UTF-8?q?fix=20issue=20#1083=20:=20SIT=20=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?= =?UTF-8?q?=20=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=96=E0=B8=B9=E0=B8=81=E0=B8=9A?= =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=A5=E0=B8=87?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlacementAppointmentController.cs | 18 ++++++-- .../Controllers/PlacementController.cs | 46 +++++++++++++------ 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index ee60e8d9..9695f2e0 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -742,7 +742,11 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfiles = await _context.PlacementAppointments .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - placementProfiles.ForEach(profile => profile.Status = "REPORT"); + placementProfiles.ForEach(profile => + { + profile.Status = "REPORT"; + profile.typeCommand = "APPOINTED"; + }); await _context.SaveChangesAsync(); return Success(); } @@ -977,7 +981,11 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => req.refIds.Contains(x.Id.ToString())) // .Where(x => x.Status.ToUpper() == "REPORT") .ToListAsync(); - placementProfiles.ForEach(profile => profile.Status = "PENDING"); + placementProfiles.ForEach(profile => + { + profile.Status = "REPORT"; + profile.typeCommand = "MOVE"; + }); await _context.SaveChangesAsync(); return Success(); } @@ -1587,7 +1595,11 @@ namespace BMA.EHR.Placement.Service.Controllers // .Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ") // .Where(x => x.typeCommand.Trim().ToUpper() == "SLIP") .ToListAsync(); - placementProfiles.ForEach(profile => profile.Status = "REPORT"); + placementProfiles.ForEach(profile => + { + profile.Status = "REPORT"; + profile.typeCommand = "SLIP"; + }); await _context.SaveChangesAsync(); return Success(); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 9b2b3b88..c1d26bd2 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1545,7 +1545,11 @@ namespace BMA.EHR.Placement.Service.Controllers // .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") .ToListAsync(); - placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); + placementProfiles.ForEach(profile => + { + profile.PlacementStatus = "REPORT"; + profile.typeCommand = "APPOINTED"; + }); await _context.SaveChangesAsync(); return Success(); } @@ -1874,10 +1878,14 @@ namespace BMA.EHR.Placement.Service.Controllers // .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.Placement!.PlacementType!.Name != "สอบคัดเลือก") // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") .ToListAsync(); - placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); + placementProfiles.ForEach(profile => + { + profile.PlacementStatus = "REPORT"; + profile.typeCommand = "APPOINTED"; + }); await _context.SaveChangesAsync(); return Success(); } @@ -2200,6 +2208,12 @@ namespace BMA.EHR.Placement.Service.Controllers // .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") .ToListAsync(); placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); + placementProfiles.ForEach(profile => + { + profile.PlacementStatus = "REPORT"; + profile.typeCommand = "APPOIN"; + }); + await _context.SaveChangesAsync(); return Success(); } @@ -2430,7 +2444,11 @@ namespace BMA.EHR.Placement.Service.Controllers // .Where(x => x.Placement!.PlacementType!.Name == "ย้ายข้าราชการ") // .Where(x => x.typeCommand.Trim().ToUpper() == "MOVE") .ToListAsync(); - placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT"); + placementProfiles.ForEach(profile => + { + profile.PlacementStatus = "REPORT"; + profile.typeCommand = "MOVE"; + }); await _context.SaveChangesAsync(); return Success(); } @@ -2966,11 +2984,11 @@ namespace BMA.EHR.Placement.Service.Controllers x.Status.Trim().ToUpper() == "DONE") .Count(); - var pp_appoint = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; - var pp_slip = placementProfiles.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; + var pp_appoint = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; + var pp_slip = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; var pp_move = placementProfiles.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; - var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; + var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; @@ -3065,11 +3083,11 @@ namespace BMA.EHR.Placement.Service.Controllers x.Status.Trim().ToUpper() == "DONE") .Count(); - var pp_appoint = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; - var pp_slip = placementProfiles.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; + var pp_appoint = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; + var pp_slip = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOIN")?.Count ?? 0; var pp_move = placementProfiles.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; - var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; + var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; @@ -3194,7 +3212,7 @@ namespace BMA.EHR.Placement.Service.Controllers x.CreatedAt.Date <= endDate && x.rootId.Contains(item.rootId) && x.Status.Trim().ToUpper() == "DONE" && - x.type.Trim().ToUpper() == "OFFICER") + x.type.Trim().ToUpper() == "EMPLOYEE") .GroupBy(x => x.typeCommand.Trim().ToUpper()) .Select(g => new { @@ -3203,7 +3221,7 @@ namespace BMA.EHR.Placement.Service.Controllers }) .ToList(); - var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; + var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; @@ -3227,7 +3245,7 @@ namespace BMA.EHR.Placement.Service.Controllers x.CreatedAt.Date <= endDate && x.rootId.Contains(item.rootId) && x.Status.Trim().ToUpper() == "DONE" && - x.type.Trim().ToUpper() == "OFFICER") + x.type.Trim().ToUpper() == "EMPLOYEE") .GroupBy(x => x.typeCommand.Trim().ToUpper()) .Select(g => new { @@ -3236,7 +3254,7 @@ namespace BMA.EHR.Placement.Service.Controllers }) .ToList(); - var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; + var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0;