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

แจ้งเตือนล่วงหน้าวินัย

Browse source
This commit is contained in:
Kittapath 2024-01-03 09:13:33 +07:00
parent 46599d1bc5
commit b371717f89
16 changed files with 3710 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

11
BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
View file

@ -53,11 +53,13 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet()]
public async Task<ActionResult<ResponseObject>> GetDisciplineInvestigate(int page = 1, int pageSize = 25, string keyword = "")
public async Task<ActionResult<ResponseObject>> GetDisciplineInvestigate(int page = 1, int pageSize = 25, string keyword = "", string status = "")
{
var data_search = (from x in _context.DisciplineInvestigates
where x.Title.Contains(keyword)
select x).ToList();
if (status.Trim().ToUpper() != "ALL")
data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
var data = data_search
.Select(x => new
{
@ -289,6 +291,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
PosNo = p.PosNo,
Organization = p.Organization,
IsSend = p.IsReport,
IsDisciplinary = p.IsDisciplinary,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
DisciplineInvestigateDocs = x.DisciplineInvestigate_Docs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
@ -451,6 +454,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
Salary = item.salary,
PersonId = item.personId,
PosNo = item.posNo,
IsDisciplinary = isReport == null ? false : isReport.IsDisciplinary,
IsReport = isReport == null ? "NEW" : isReport.IsReport,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -529,9 +533,9 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
Title = data.Title,
Description = data.Description,
DateReceived = data.DateReceived,
LevelConsideration = data.LevelConsideration.Trim().ToUpper(),
LevelConsideration = data.LevelConsideration == null ? null : data.LevelConsideration.Trim().ToUpper(),
DateConsideration = data.DateConsideration,
OffenseDetails = data.OffenseDetails.Trim().ToUpper(),
OffenseDetails = data.OffenseDetails == null ? null : data.OffenseDetails.Trim().ToUpper(),
DateNotification = data.DateNotification,
ComplaintFrom = data.ComplaintFrom,
Appellant = data.Appellant,
@ -584,6 +588,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
item.IsDisciplinary = true;
}
foreach (var item in data.DisciplineInvestigate_DocComplaints)
{