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

แก้สถ่นะออกคำสั่ง
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
moss 2025-04-03 11:13:25 +07:00
parent e160e1e552
commit e947f08f8e
14 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

24
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -294,7 +294,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
// continue;
// uppdated.CommandTypeId = commandTypeId;
// uppdated.Status = "REPORT";
// uppdated.Status = req.status.Trim().ToUpper();
// uppdated.LastUpdateFullName = FullName ?? "System Administrator";
// uppdated.LastUpdateUserId = UserId ?? "";
// uppdated.LastUpdatedAt = DateTime.Now;
@ -769,7 +769,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -898,7 +898,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1029,7 +1029,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineReport_Profiles
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1209,7 +1209,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineReport_Profiles
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1327,7 +1327,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1443,7 +1443,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1559,7 +1559,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1675,7 +1675,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1791,7 +1791,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = "REPORT");
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1908,12 +1908,12 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data1.ForEach(profile => profile.IsReport = "REPORT");
data1.ForEach(profile => profile.IsReport = req.status.Trim().ToUpper());
var data2 = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data2.ForEach(profile => profile.IsReport = "REPORT");
data2.ForEach(profile => profile.IsReport = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();

1
BMA.EHR.Discipline.Service/Requests/ReportPersonRequest.cs
View file

@ -6,5 +6,6 @@ namespace BMA.EHR.Discipline.Service.Requests
public class ReportPersonRequest
{
public string[] refIds { get; set; }
public string status { get; set; }
}
}

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

@ -759,7 +759,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.Status = "REPORT";
profile.Status = req.status.Trim().ToUpper();
profile.typeCommand = "APPOINT";
});
await _context.SaveChangesAsync();
@ -969,7 +969,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.Status = "REPORT";
profile.Status = req.status.Trim().ToUpper();
profile.typeCommand = "MOVE";
});
await _context.SaveChangesAsync();
@ -1180,7 +1180,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.Status = "REPORT";
profile.Status = req.status.Trim().ToUpper();
profile.typeCommand = "SLIP";
});
await _context.SaveChangesAsync();
@ -1380,7 +1380,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.Status = "REPORT";
profile.Status = req.status.Trim().ToUpper();
profile.typeCommand = "MOVE";
});
await _context.SaveChangesAsync();
@ -1588,7 +1588,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.Status = "REPORT";
profile.Status = req.status.Trim().ToUpper();
profile.typeCommand = "SLIP";
});
await _context.SaveChangesAsync();

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

@ -1564,7 +1564,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.PlacementStatus = "REPORT";
profile.PlacementStatus = req.status.Trim().ToUpper();
profile.typeCommand = "APPOINT";
});
await _context.SaveChangesAsync();
@ -1895,7 +1895,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.PlacementStatus = "REPORT";
profile.PlacementStatus = req.status.Trim().ToUpper();
profile.typeCommand = "APPOINT";
});
await _context.SaveChangesAsync();
@ -2219,10 +2219,10 @@ namespace BMA.EHR.Placement.Service.Controllers
// .Where(x => x.Placement!.PlacementType!.Name == "แต่งตั้งข้าราชการ")
// .Where(x => x.typeCommand.Trim().ToUpper() == "APPOIN")
.ToListAsync();
placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT");
placementProfiles.ForEach(profile => profile.PlacementStatus = req.status.Trim().ToUpper());
placementProfiles.ForEach(profile =>
{
profile.PlacementStatus = "REPORT";
profile.PlacementStatus = req.status.Trim().ToUpper();
profile.typeCommand = "APPOIN";
});
@ -2455,7 +2455,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.PlacementStatus = "REPORT";
profile.PlacementStatus = req.status.Trim().ToUpper();
profile.typeCommand = "MOVE";
});
await _context.SaveChangesAsync();
@ -2681,7 +2681,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementProfiles = await _context.PlacementProfiles
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.PlacementStatus = "REPORT");
placementProfiles.ForEach(profile => profile.PlacementStatus = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}

4
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -411,7 +411,7 @@ namespace BMA.EHR.Placement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
placementOfficer.OrganizationPositionOld = org.result.position + "\n" + (placementOfficer.PositionExecutiveOld == null ? "" : placementOfficer.PositionExecutiveOld + "\n") + placementOfficer.OrganizationOld;
placementOfficer.OrganizationPositionOld = org.result.position + "\n" + (placementOfficer.PositionExecutiveOld == null ? "" : placementOfficer.PositionExecutiveOld + "\n") + placementOfficer.OrganizationOld;
}
await _context.PlacementOfficers.AddAsync(placementOfficer);
await _context.SaveChangesAsync();
@ -561,7 +561,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementProfiles = await _context.PlacementOfficers
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}

2
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -885,7 +885,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementProfiles = await _context.PlacementReceives
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}

2
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -500,7 +500,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementProfiles = await _context.PlacementRepatriations
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}

2
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -752,7 +752,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementProfiles = await _context.PlacementTransfers
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}

1
BMA.EHR.Placement.Service/Requests/ReportPersonRequest.cs
View file

@ -6,5 +6,6 @@ namespace BMA.EHR.Placement.Service.Requests
public class ReportPersonRequest
{
public string[] refIds { get; set; }
public string status { get; set; }
}
}

4
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -660,7 +660,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var placementProfiles = await _context.RetirementOthers
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -880,7 +880,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var placementProfiles = await _context.RetirementOthers
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}

4
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -363,7 +363,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
retirementOut.OrganizationPositionOld = org.result.position + "\n" + (retirementOut.PositionExecutiveOld == null ? "" : retirementOut.PositionExecutiveOld + "\n") + retirementOut.OrganizationOld;
retirementOut.OrganizationPositionOld = org.result.position + "\n" + (retirementOut.PositionExecutiveOld == null ? "" : retirementOut.PositionExecutiveOld + "\n") + retirementOut.OrganizationOld;
retirementOut.AmountOld = org.result.salary;
}
}
@ -513,7 +513,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var placementProfiles = await _context.RetirementResigns
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}

19
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -948,7 +948,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
retirementResign.OrganizationPositionOld = org.result.position + "\n" + (retirementResign.PositionExecutiveOld == null ? "" : retirementResign.PositionExecutiveOld + "\n") + retirementResign.OrganizationOld;
retirementResign.OrganizationPositionOld = org.result.position + "\n" + (retirementResign.PositionExecutiveOld == null ? "" : retirementResign.PositionExecutiveOld + "\n") + retirementResign.OrganizationOld;
}
await _context.RetirementResigns.AddAsync(retirementResign);
await _context.SaveChangesAsync();
@ -1159,7 +1159,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
if (updated == null)
return Error(GlobalMessages.RetirementResignNotFound, 404);
updated.CancelReason = req.Reason;
if (updated.Status == "DONE")
if (updated.Status == "DONE" || updated.Status == "WAITTING")
{
var retirementResignCancel = new RetirementResignCancel
{
@ -1246,6 +1246,15 @@ namespace BMA.EHR.Retirement.Service.Controllers
}
updated.IsCancel = true;
}
else
{
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
var _res = await client.DeleteAsync($"{_configuration["API"]}/org/command/tab2Cancel17/{updated.Id}");
}
}
updated.Status = "CANCEL";
updated.LastUpdateFullName = FullName ?? "System Administrator";
updated.LastUpdateUserId = UserId ?? "";
@ -2116,7 +2125,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var placementProfiles = await _context.RetirementResigns
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -2302,7 +2311,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var placementProfiles = await _context.RetirementResignCancels
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -2357,7 +2366,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.PositionOld ?? "-",
Organization = p.OrganizationPositionOld ?? "-",
Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +

13
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -1152,6 +1152,15 @@ namespace BMA.EHR.Retirement.Service.Controllers
}
updated.IsCancel = true;
}
else
{
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
var _res = await client.DeleteAsync($"{_configuration["API"]}/org/command/tab2Cancel23/{updated.Id}");
}
}
updated.Status = "CANCEL";
updated.LastUpdateFullName = FullName ?? "System Administrator";
updated.LastUpdateUserId = UserId ?? "";
@ -1557,7 +1566,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var placementProfiles = await _context.RetirementResignEmployees
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}
@ -1742,7 +1751,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var placementProfiles = await _context.RetirementResignEmployeeCancels
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile => profile.Status = "REPORT");
placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
await _context.SaveChangesAsync();
return Success();
}

1
BMA.EHR.Retirement.Service/Requests/ReportPersonRequest.cs
View file

@ -6,5 +6,6 @@ namespace BMA.EHR.Retirement.Service.Requests
public class ReportPersonRequest
{
public string[] refIds { get; set; }
public string status { get; set; }
}
}