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

สรุปผลวินัยเพิ่มstatusบุคคล

Browse source
This commit is contained in:
Kittapath 2023-12-01 21:44:16 +07:00
parent 49d70b1e05
commit 8dae449c62
10 changed files with 11384 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
View file

@ -55,7 +55,9 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
[HttpGet()]
public async Task<ActionResult<ResponseObject>> GetDisciplineSuspend(int page = 1, int pageSize = 25, string keyword = "")
{
var data_search = (from x in _context.DisciplineReport_Profiles.Include(x => x.DisciplineDisciplinary)
var data_search = (from x in _context.DisciplineReport_Profiles
.Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigate)
.ThenInclude(x => x.DisciplineDisciplinary)
where x.CitizenId.Contains(keyword) ||
x.Prefix.Contains(keyword) ||
x.FirstName.Contains(keyword) ||
@ -64,7 +66,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
x.Position.Contains(keyword) ||
x.PosNo.Contains(keyword) ||
x.PositionLevel.Contains(keyword) ||
x.DisciplineDisciplinary.Title.Contains(keyword)
x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title.Contains(keyword)
select x).ToList();
var data = data_search
.Select(x => new
@ -83,10 +85,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
DescriptionSuspend = x.DescriptionSuspend,
StartDateSuspend = x.StartDateSuspend,
EndDateSuspend = x.EndDateSuspend,
Title = x.DisciplineDisciplinary.Title,
OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
Title = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title,
OffenseDetails = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
DisciplinaryFaultLevel = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
DisciplinaryCaseFault = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
})
.OrderByDescending(x => x.CitizenId)
.Skip((page - 1) * pageSize)
@ -123,10 +125,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
DescriptionSuspend = x.DescriptionSuspend,
StartDateSuspend = x.StartDateSuspend,
EndDateSuspend = x.EndDateSuspend,
Title = x.DisciplineDisciplinary.Title,
OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
Title = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title,
OffenseDetails = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
DisciplinaryFaultLevel = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
DisciplinaryCaseFault = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
})
.Where(x => x.Id == id)
.FirstOrDefaultAsync();