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

change APPOINTED to APPOINT

Browse source
This commit is contained in:
moss 2025-03-27 12:00:32 +07:00
parent 9be78c8bdc
commit 8460a96db0
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -248,7 +248,7 @@ namespace BMA.EHR.Application.Repositories.Commands
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN") .Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
.Where(x => x.Draft! == true) .Where(x => x.Draft! == true)
.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() == "APPOINT")
.OrderBy(x => x.ExamNumber) .OrderBy(x => x.ExamNumber)
.ToListAsync(); .ToListAsync();
@ -307,7 +307,7 @@ namespace BMA.EHR.Application.Repositories.Commands
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN") .Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
.Where(x => x.Draft! == true) .Where(x => x.Draft! == true)
.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() == "APPOINT")
.OrderBy(x => x.ExamNumber) .OrderBy(x => x.ExamNumber)
.ToListAsync(); .ToListAsync();

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

@ -758,7 +758,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementProfiles.ForEach(profile => placementProfiles.ForEach(profile =>
{ {
profile.Status = "REPORT"; profile.Status = "REPORT";
profile.typeCommand = "APPOINTED"; profile.typeCommand = "APPOINT";
}); });
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
return Success(); return Success();
@ -1029,7 +1029,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = "-", LeaveDate = "-",
NewOc =(p.position == null ? "" : $"{p.position}\n") + NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") + (p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.child4 == null ? "" : $"{p.child4}\n") + (p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\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() : "-", p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().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.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.child4 == null ? "" : $"{p.child4}\n") + (p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") + (p.child3 == null ? "" : $"{p.child3}\n") +

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

@ -1560,12 +1560,12 @@ namespace BMA.EHR.Placement.Service.Controllers
// .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() == "APPOINT")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => placementProfiles.ForEach(profile =>
{ {
profile.PlacementStatus = "REPORT"; profile.PlacementStatus = "REPORT";
profile.typeCommand = "APPOINTED"; profile.typeCommand = "APPOINT";
}); });
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
return Success(); return Success();
@ -1615,7 +1615,7 @@ namespace BMA.EHR.Placement.Service.Controllers
// .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() == "APPOINT")
.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
@ -1629,7 +1629,7 @@ namespace BMA.EHR.Placement.Service.Controllers
PositionName = p.positionName == null ? "-" : p.positionName, PositionName = p.positionName == null ? "-" : p.positionName,
ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(), ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(),
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()} {p.Placement.Year.ToThaiYear().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.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.child4 == null ? "" : $"{p.child4}\n") + (p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") + (p.child3 == null ? "" : $"{p.child3}\n") +
@ -1891,12 +1891,12 @@ namespace BMA.EHR.Placement.Service.Controllers
// .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() == "APPOINT")
.ToListAsync(); .ToListAsync();
placementProfiles.ForEach(profile => placementProfiles.ForEach(profile =>
{ {
profile.PlacementStatus = "REPORT"; profile.PlacementStatus = "REPORT";
profile.typeCommand = "APPOINTED"; profile.typeCommand = "APPOINT";
}); });
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
return Success(); return Success();
@ -1946,7 +1946,7 @@ namespace BMA.EHR.Placement.Service.Controllers
// .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() == "APPOINT")
.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
@ -3015,11 +3015,11 @@ namespace BMA.EHR.Placement.Service.Controllers
x.Status.Trim().ToUpper() == "DONE") x.Status.Trim().ToUpper() == "DONE")
.Count(); .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 == "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 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_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0;
var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.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") x.Status.Trim().ToUpper() == "DONE")
.Count(); .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_slip = placementProfiles.FirstOrDefault(x => x.TypeCommand == "APPOIN")?.Count ?? 0;
var pp_move = placementProfiles.FirstOrDefault(x => x.TypeCommand == "MOVE")?.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_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0;
var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.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)) (node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true))
.Count(); .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_appoint = pae_count;
var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0;
var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.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)) (node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true))
.Count(); .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_appoint = pae_count;
var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0;
var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0;