From 8460a96db0fecb4d3e9290ebe7833c5d394de8eb Mon Sep 17 00:00:00 2001 From: moss <> Date: Thu, 27 Mar 2025 12:00:32 +0700 Subject: [PATCH] change APPOINTED to APPOINT --- .../Commands/CommandRepository.cs | 4 +-- .../PlacementAppointmentController.cs | 6 ++-- .../Controllers/PlacementController.cs | 28 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index 45f375eb..52e1a517 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -248,7 +248,7 @@ namespace BMA.EHR.Application.Repositories.Commands .Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN") .Where(x => x.Draft! == true) .Where(x => x.Placement!.PlacementType!.Name == "สอบแข่งขัน") - .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") + .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINT") .OrderBy(x => x.ExamNumber) .ToListAsync(); @@ -307,7 +307,7 @@ namespace BMA.EHR.Application.Repositories.Commands .Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN") .Where(x => x.Draft! == true) .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") - .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") + .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINT") .OrderBy(x => x.ExamNumber) .ToListAsync(); diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 1c21490a..f2537334 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -758,7 +758,7 @@ namespace BMA.EHR.Placement.Service.Controllers placementProfiles.ForEach(profile => { profile.Status = "REPORT"; - profile.typeCommand = "APPOINTED"; + profile.typeCommand = "APPOINT"; }); await _context.SaveChangesAsync(); return Success(); @@ -1029,7 +1029,7 @@ namespace BMA.EHR.Placement.Service.Controllers OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), LeaveDate = "-", - NewOc =(p.position == null ? "" : $"{p.position}\n") + + NewOc = (p.position == null ? "" : $"{p.position}\n") + (p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") + (p.child4 == null ? "" : $"{p.child4}\n") + (p.child3 == null ? "" : $"{p.child3}\n") + @@ -1657,7 +1657,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(), - NewOc = (p.position == null ? "" : $"{p.position}\n") + + NewOc = (p.position == null ? "" : $"{p.position}\n") + (p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") + (p.child4 == null ? "" : $"{p.child4}\n") + (p.child3 == null ? "" : $"{p.child3}\n") + diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 183a9fb3..39a72123 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1560,12 +1560,12 @@ namespace BMA.EHR.Placement.Service.Controllers // .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.typeCommand.Trim().ToUpper() == "APPOINT") .ToListAsync(); placementProfiles.ForEach(profile => { profile.PlacementStatus = "REPORT"; - profile.typeCommand = "APPOINTED"; + profile.typeCommand = "APPOINT"; }); await _context.SaveChangesAsync(); return Success(); @@ -1615,7 +1615,7 @@ namespace BMA.EHR.Placement.Service.Controllers // .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.typeCommand.Trim().ToUpper() == "APPOINT") .ToList() join r in req.refIds on p.Id.ToString() equals r.refId @@ -1629,7 +1629,7 @@ namespace BMA.EHR.Placement.Service.Controllers PositionName = p.positionName == null ? "-" : p.positionName, ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(), PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()} {p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}", - Oc = (p.positionName == null ? "" : $"{p.positionName}\n") + + Oc = (p.positionName == null ? "" : $"{p.positionName}\n") + (p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") + (p.child4 == null ? "" : $"{p.child4}\n") + (p.child3 == null ? "" : $"{p.child3}\n") + @@ -1891,12 +1891,12 @@ namespace BMA.EHR.Placement.Service.Controllers // .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.typeCommand.Trim().ToUpper() == "APPOINT") .ToListAsync(); placementProfiles.ForEach(profile => { profile.PlacementStatus = "REPORT"; - profile.typeCommand = "APPOINTED"; + profile.typeCommand = "APPOINT"; }); await _context.SaveChangesAsync(); return Success(); @@ -1946,7 +1946,7 @@ namespace BMA.EHR.Placement.Service.Controllers // .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.typeCommand.Trim().ToUpper() == "APPOINT") .ToList() join r in req.refIds on p.Id.ToString() equals r.refId @@ -3015,11 +3015,11 @@ namespace BMA.EHR.Placement.Service.Controllers x.Status.Trim().ToUpper() == "DONE") .Count(); - var pp_appoint = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; - var pp_slip = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; + var pp_appoint = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; + var pp_slip = placementProfiles.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pp_move = placementProfiles.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; - var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; + var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; @@ -3142,11 +3142,11 @@ namespace BMA.EHR.Placement.Service.Controllers x.Status.Trim().ToUpper() == "DONE") .Count(); - var pp_appoint = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; + var pp_appoint = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.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 == "APPOINTED")?.Count ?? 0; + var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; @@ -3295,7 +3295,7 @@ namespace BMA.EHR.Placement.Service.Controllers (node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true)) .Count(); - //var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; + //var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; var pa_appoint = pae_count; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; @@ -3344,7 +3344,7 @@ namespace BMA.EHR.Placement.Service.Controllers (node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true)) .Count(); - //var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0; + //var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINT")?.Count ?? 0; var pa_appoint = pae_count; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0;