diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index bd37a113..75642804 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -757,11 +757,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfiles = await _context.PlacementAppointments .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } @@ -918,11 +914,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfiles = await _context.PlacementAppointments .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } @@ -1079,11 +1071,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfiles = await _context.PlacementAppointments .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } @@ -1237,11 +1225,7 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => x.type == "EMPLOYEE") .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } @@ -1388,11 +1372,7 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => req.refIds.Contains(x.Id.ToString())) .Where(x => x.type == "EMPLOYEE") .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 3767bb5a..45eb20eb 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1479,11 +1479,7 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.PlacementStatus = "PREPARE-CONTAIN"; - } + placementProfiles.ForEach(profile => profile.PlacementStatus = "PREPARE-CONTAIN"); await _context.SaveChangesAsync(); return Success(); } @@ -1756,11 +1752,7 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") .Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED") .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.PlacementStatus = "PREPARE-CONTAIN"; - } + placementProfiles.ForEach(profile => profile.PlacementStatus = "PREPARE-CONTAIN"); await _context.SaveChangesAsync(); return Success(); } @@ -2032,11 +2024,7 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ") .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN") .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.PlacementStatus = "PREPARE-CONTAIN"; - } + placementProfiles.ForEach(profile => profile.PlacementStatus = "PREPARE-CONTAIN"); await _context.SaveChangesAsync(); return Success(); } @@ -2205,11 +2193,7 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => x.Placement!.PlacementType!.Name == "ย้ายข้าราชการ") .Where(x => x.typeCommand.Trim().ToUpper() == "MOVE") .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.PlacementStatus = "PREPARE-CONTAIN"; - } + placementProfiles.ForEach(profile => profile.PlacementStatus = "PREPARE-CONTAIN"); await _context.SaveChangesAsync(); return Success(); } @@ -2374,11 +2358,7 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => x.Placement!.PlacementType!.Name == "เลื่อนข้าราชการ") .Where(x => x.typeCommand.Trim().ToUpper() == "SLIP") .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.PlacementStatus = "PREPARE-CONTAIN"; - } + placementProfiles.ForEach(profile => profile.PlacementStatus = "PREPARE-CONTAIN"); await _context.SaveChangesAsync(); return Success(); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index abb9002f..555606a6 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -582,11 +582,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfiles = await _context.PlacementOfficers .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index e48ca341..87c72f20 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -894,11 +894,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfiles = await _context.PlacementReceives .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index dde4991b..6ea41841 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -489,11 +489,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfiles = await _context.PlacementRepatriations .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index dd164e49..cc4322ea 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -772,11 +772,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfiles = await _context.PlacementTransfers .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } diff --git a/BMA.EHR.Placement.Service/Requests/ReportAttachmentRequest.cs b/BMA.EHR.Placement.Service/Requests/ReportAttachmentRequest.cs new file mode 100644 index 00000000..7718c354 --- /dev/null +++ b/BMA.EHR.Placement.Service/Requests/ReportAttachmentRequest.cs @@ -0,0 +1,21 @@ +using BMA.EHR.Domain.Models.MetaData; +using Microsoft.EntityFrameworkCore; + +namespace BMA.EHR.Placement.Service.Requests +{ + public class ReportExecuteRequest + { + public ReportExecuteRequestObj[] refIds { get; set; } + } + public class ReportExecuteRequestObj + { + public string? refId { get; set; } + public DateTime commandAffectDate { get; set; } + public string? commandNo { get; set; } + public int commandYear { get; set; } + public string? templateDoc { get; set; } + public double? amount { get; set; } + public double? positionSalaryAmount { get; set; } + public double? mouthSalaryAmount { get; set; } + } +} diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index bd08e778..eb0b7199 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -639,11 +639,7 @@ namespace BMA.EHR.Retirement.Service.Controllers var placementProfiles = await _context.RetirementOthers .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } @@ -789,11 +785,7 @@ namespace BMA.EHR.Retirement.Service.Controllers var placementProfiles = await _context.RetirementOthers .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index 7f88d024..034e2e55 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -480,11 +480,7 @@ namespace BMA.EHR.Retirement.Service.Controllers var placementProfiles = await _context.RetirementResigns .Where(x => req.refIds.Contains(x.Id.ToString())) .ToListAsync(); - foreach (var placementProfile in placementProfiles) - { - // update placementstatus - placementProfile.Status = "REPORT"; - } + placementProfiles.ForEach(profile => profile.Status = "REPORT"); await _context.SaveChangesAsync(); return Success(); }