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

เพิ่มคิวรี่ subject ที่คำสั่ง

Browse source
This commit is contained in:
Kittapath 2023-10-03 15:48:02 +07:00
parent c9d0800461
commit 785d8b4f6b
3 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var placementAppointments = await _context.PlacementAppointments.AsQueryable() var placementAppointments = await _context.PlacementAppointments.AsQueryable()
.Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "PREM") || (x.Profile.ProfileType == "OFFICER")) .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER"))
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.Select(p => new .Select(p => new
{ {
@ -124,7 +124,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> GetDetailByUser(Guid id) public async Task<ActionResult<ResponseObject>> GetDetailByUser(Guid id)
{ {
var data = await _context.PlacementAppointments.AsQueryable() var data = await _context.PlacementAppointments.AsQueryable()
.Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "PREM") || (x.Profile.ProfileType == "OFFICER")) .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER"))
.Where(x => x.Id == id) .Where(x => x.Id == id)
.Select(p => new .Select(p => new
{ {
@ -244,7 +244,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.Include(x => x.Position) .Include(x => x.Position)
.Include(x => x.Gender) .Include(x => x.Gender)
.Include(x => x.Prefix) .Include(x => x.Prefix)
.Where(x => (x.ProfileType == "EMPLOYEE" && x.EmployeeType == "PREM") || (x.ProfileType == "OFFICER")) .Where(x => (x.ProfileType == "EMPLOYEE" && x.EmployeeClass == "PREM") || (x.ProfileType == "OFFICER"))
.FirstOrDefaultAsync(x => x.Id == req.Id); .FirstOrDefaultAsync(x => x.Id == req.Id);
if (profile == null) if (profile == null)
return Error(GlobalMessages.DataNotFound, 404); return Error(GlobalMessages.DataNotFound, 404);
@ -326,7 +326,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> UpdatePositionPlacementAppointment([FromBody] PersonSelectPositionAppointmentRequest req, Guid id) public async Task<ActionResult<ResponseObject>> UpdatePositionPlacementAppointment([FromBody] PersonSelectPositionAppointmentRequest req, Guid id)
{ {
var uppdated = await _context.PlacementAppointments var uppdated = await _context.PlacementAppointments
.Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "PREM") || (x.Profile.ProfileType == "OFFICER")) .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER"))
.FirstOrDefaultAsync(x => x.Id == id); .FirstOrDefaultAsync(x => x.Id == id);
if (uppdated == null) if (uppdated == null)
return Error(GlobalMessages.PlacementAppointmentNotFound, 404); return Error(GlobalMessages.PlacementAppointmentNotFound, 404);
@ -406,7 +406,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> Put([FromBody] PlacementAppointmentEditRequest req, Guid id) public async Task<ActionResult<ResponseObject>> Put([FromBody] PlacementAppointmentEditRequest req, Guid id)
{ {
var uppdated = await _context.PlacementAppointments var uppdated = await _context.PlacementAppointments
.Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "PREM") || (x.Profile.ProfileType == "OFFICER")) .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER"))
.FirstOrDefaultAsync(x => x.Id == id); .FirstOrDefaultAsync(x => x.Id == id);
if (uppdated == null) if (uppdated == null)
return Error(GlobalMessages.PlacementAppointmentNotFound, 404); return Error(GlobalMessages.PlacementAppointmentNotFound, 404);
@ -489,7 +489,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var deleted = await _context.PlacementAppointments.AsQueryable() var deleted = await _context.PlacementAppointments.AsQueryable()
.Include(x => x.PlacementAppointmentDocs) .Include(x => x.PlacementAppointmentDocs)
.ThenInclude(x => x.Document) .ThenInclude(x => x.Document)
.Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "PREM") || (x.Profile.ProfileType == "OFFICER")) .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER"))
.FirstOrDefaultAsync(x => x.Id == id); .FirstOrDefaultAsync(x => x.Id == id);
if (deleted == null) if (deleted == null)
return NotFound(); return NotFound();
@ -526,7 +526,7 @@ namespace BMA.EHR.Placement.Service.Controllers
foreach (var item in req.Id) foreach (var item in req.Id)
{ {
var uppdated = await _context.PlacementAppointments var uppdated = await _context.PlacementAppointments
.Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "PREM") || (x.Profile.ProfileType == "OFFICER")) .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER"))
.FirstOrDefaultAsync(x => x.Id == item); .FirstOrDefaultAsync(x => x.Id == item);
if (uppdated == null) if (uppdated == null)
continue; continue;
@ -556,6 +556,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var appointments = await _context.PlacementAppointments var appointments = await _context.PlacementAppointments
.Where(x => x.PositionNumber != null) .Where(x => x.PositionNumber != null)
.Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER"))
.Select(x => x.PositionNumber.Id) .Select(x => x.PositionNumber.Id)
.ToListAsync(); .ToListAsync();

15
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
View file

@ -64,7 +64,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementAppointments = await _context.PlacementAppointments.AsQueryable() var placementAppointments = await _context.PlacementAppointments.AsQueryable()
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "TEMP") .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP")
.Select(p => new .Select(p => new
{ {
p.Id, p.Id,
@ -127,7 +127,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var data = await _context.PlacementAppointments.AsQueryable() var data = await _context.PlacementAppointments.AsQueryable()
.Where(x => x.Id == id) .Where(x => x.Id == id)
.Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "TEMP") .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP")
.Select(p => new .Select(p => new
{ {
p.Id, p.Id,
@ -246,7 +246,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.Include(x => x.Position) .Include(x => x.Position)
.Include(x => x.Gender) .Include(x => x.Gender)
.Include(x => x.Prefix) .Include(x => x.Prefix)
.Where(x => x.ProfileType == "EMPLOYEE" && x.EmployeeType == "TEMP") .Where(x => x.ProfileType == "EMPLOYEE" && x.EmployeeClass == "TEMP")
.FirstOrDefaultAsync(x => x.Id == req.Id); .FirstOrDefaultAsync(x => x.Id == req.Id);
if (profile == null) if (profile == null)
return Error(GlobalMessages.DataNotFound, 404); return Error(GlobalMessages.DataNotFound, 404);
@ -328,7 +328,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> UpdatePositionPlacementAppointment([FromBody] PersonSelectPositionAppointmentRequest req, Guid id) public async Task<ActionResult<ResponseObject>> UpdatePositionPlacementAppointment([FromBody] PersonSelectPositionAppointmentRequest req, Guid id)
{ {
var uppdated = await _context.PlacementAppointments var uppdated = await _context.PlacementAppointments
.Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "TEMP") .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP")
.FirstOrDefaultAsync(x => x.Id == id); .FirstOrDefaultAsync(x => x.Id == id);
if (uppdated == null) if (uppdated == null)
return Error(GlobalMessages.PlacementAppointmentNotFound, 404); return Error(GlobalMessages.PlacementAppointmentNotFound, 404);
@ -408,7 +408,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> Put([FromBody] PlacementAppointmentEditRequest req, Guid id) public async Task<ActionResult<ResponseObject>> Put([FromBody] PlacementAppointmentEditRequest req, Guid id)
{ {
var uppdated = await _context.PlacementAppointments var uppdated = await _context.PlacementAppointments
.Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "TEMP") .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP")
.FirstOrDefaultAsync(x => x.Id == id); .FirstOrDefaultAsync(x => x.Id == id);
if (uppdated == null) if (uppdated == null)
return Error(GlobalMessages.PlacementAppointmentNotFound, 404); return Error(GlobalMessages.PlacementAppointmentNotFound, 404);
@ -491,7 +491,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var deleted = await _context.PlacementAppointments.AsQueryable() var deleted = await _context.PlacementAppointments.AsQueryable()
.Include(x => x.PlacementAppointmentDocs) .Include(x => x.PlacementAppointmentDocs)
.ThenInclude(x => x.Document) .ThenInclude(x => x.Document)
.Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "TEMP") .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP")
.FirstOrDefaultAsync(x => x.Id == id); .FirstOrDefaultAsync(x => x.Id == id);
if (deleted == null) if (deleted == null)
return NotFound(); return NotFound();
@ -528,7 +528,7 @@ namespace BMA.EHR.Placement.Service.Controllers
foreach (var item in req.Id) foreach (var item in req.Id)
{ {
var uppdated = await _context.PlacementAppointments var uppdated = await _context.PlacementAppointments
.Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeType == "TEMP") .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP")
.FirstOrDefaultAsync(x => x.Id == item); .FirstOrDefaultAsync(x => x.Id == item);
if (uppdated == null) if (uppdated == null)
continue; continue;
@ -558,6 +558,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
var appointments = await _context.PlacementAppointments var appointments = await _context.PlacementAppointments
.Where(x => x.PositionNumber != null) .Where(x => x.PositionNumber != null)
.Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP")
.Select(x => x.PositionNumber.Id) .Select(x => x.PositionNumber.Id)
.ToListAsync(); .ToListAsync();

15
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -439,12 +439,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
Document = retire.Document, Document = retire.Document,
Total = retire.RetirementProfiles.Count(), Total = retire.RetirementProfiles.Count(),
ProfileFile = file_name, ProfileFile = file_name,
CreatedUserId = UserId ?? "System Administrator", CreatedUserId = retire.CreatedUserId,
CreatedFullName = FullName ?? "", CreatedFullName = retire.CreatedFullName,
CreatedAt = DateTime.Now, CreatedAt = retire.CreatedAt,
LastUpdateFullName = FullName ?? "System Administrator", LastUpdateFullName = retire.LastUpdateFullName,
LastUpdateUserId = UserId ?? "", LastUpdateUserId = retire.LastUpdateUserId,
LastUpdatedAt = DateTime.Now, LastUpdatedAt = retire.LastUpdatedAt,
}; };
await _context.RetirementPeriodHistorys.AddAsync(history); await _context.RetirementPeriodHistorys.AddAsync(history);
// await _context.SaveChangesAsync(); // await _context.SaveChangesAsync();
@ -452,6 +452,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
retire.Document = null; retire.Document = null;
retire.Round = retire.Round + 1; retire.Round = retire.Round + 1;
retire.TypeReport = req.Option.Trim().ToUpper(); retire.TypeReport = req.Option.Trim().ToUpper();
retire.CreatedUserId = UserId ?? "System Administrator";
retire.CreatedFullName = FullName ?? "";
retire.CreatedAt = DateTime.Now;
retire.LastUpdateFullName = FullName ?? "System Administrator"; retire.LastUpdateFullName = FullName ?? "System Administrator";
retire.LastUpdateUserId = UserId ?? ""; retire.LastUpdateUserId = UserId ?? "";
retire.LastUpdatedAt = DateTime.Now; retire.LastUpdatedAt = DateTime.Now;