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

7
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -53,7 +53,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet()]
public async Task<ActionResult<ResponseObject>> GetDisciplineDisciplinary(int page = 1, int pageSize = 25, string keyword = "")
public async Task<ActionResult<ResponseObject>> GetDisciplineDisciplinary(int page = 1, int pageSize = 25, string keyword = "", string status = "")
{
var data_search = (from x in _context.DisciplineDisciplinarys
where x.Title.Contains(keyword) ||
@ -62,6 +62,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
x.DisciplinaryFaultLevel.Contains(keyword) ||
x.DisciplinaryCaseFault.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
{
@ -465,6 +467,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
// Report = p.DisciplineReport_Profiles.Count() > 0 ? true : false,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
DisciplinaryFaultLevelOther = x.DisciplinaryFaultLevelOther,
DisciplineDisciplinary_DocRelevants = x.DisciplineDisciplinary_DocRelevants.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
DisciplineDisciplinary_DocSummaryEvidences = x.DisciplineDisciplinary_DocSummaryEvidences.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
DisciplineDisciplinary_DocRecordAccusers = x.DisciplineDisciplinary_DocRecordAccusers.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
@ -561,6 +564,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
_data.RespondentType,
_data.Persons,
_data.OrganizationId,
_data.DisciplinaryFaultLevelOther,
disciplineDisciplinary_DocRelevants,
disciplineDisciplinary_DocSummaryEvidences,
disciplineDisciplinary_DocRecordAccusers,
@ -613,6 +617,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
data.DisciplinaryStatusResult = req.DisciplinaryStatusResult;
data.DisciplinaryCauseText = req.DisciplinaryCauseText;
data.DisciplinaryResult = req.DisciplinaryResult;
data.DisciplinaryFaultLevelOther = req.DisciplinaryFaultLevelOther;
data.Result = req.Result;
data.LastUpdateFullName = FullName ?? "System Administrator";
data.LastUpdateUserId = UserId ?? "";