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:
Bright 2024-12-18 18:39:05 +07:00
parent b042f471b4
commit e409277518
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs
View file

@ -172,7 +172,8 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
Id = x.Id,//id ข้อมูลเรื่องร้องเรียน Id = x.Id,//id ข้อมูลเรื่องร้องเรียน
RespondentType = x.RespondentType,//ผู้ถูกร้องเรียน RespondentType = x.RespondentType,//ผู้ถูกร้องเรียน
Persons = x.DisciplineComplaint_Profiles Persons = x.DisciplineComplaint_Profiles
.OrderByDescending(p => p.CreatedAt) .OrderByDescending(p => p.profileType)
.ThenByDescending(p => p.CreatedAt)
.Select(p => new .Select(p => new
{ {
Id = p.Id, Id = p.Id,

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

@ -481,7 +481,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
}).ToList(), }).ToList(),
RespondentType = x.RespondentType,//ผู้ถูกสืบสวน RespondentType = x.RespondentType,//ผู้ถูกสืบสวน
Persons = x.DisciplineDisciplinary_ProfileComplaintInvestigates Persons = x.DisciplineDisciplinary_ProfileComplaintInvestigates
.OrderByDescending(p => p.CreatedAt) .OrderByDescending(p => p.profileType)
.ThenByDescending(p => p.CreatedAt)
.Select(p => new .Select(p => new
{ {
Id = p.Id, Id = p.Id,

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

@ -314,7 +314,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
}).ToList(), }).ToList(),
RespondentType = x.RespondentType,//ผู้ถูกสืบสวน RespondentType = x.RespondentType,//ผู้ถูกสืบสวน
Persons = x.DisciplineInvestigate_ProfileComplaints Persons = x.DisciplineInvestigate_ProfileComplaints
.OrderByDescending(p => p.CreatedAt) .OrderByDescending(p => p.profileType)
.ThenByDescending(p => p.CreatedAt)
.Select(p => new .Select(p => new
{ {
Id = p.Id, Id = p.Id,

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

@ -148,7 +148,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
IdComplaint = x.DisciplineInvestigate.DisciplineComplaint.Id,//id ข้อมูลเรื่องร้องเรียน IdComplaint = x.DisciplineInvestigate.DisciplineComplaint.Id,//id ข้อมูลเรื่องร้องเรียน
RespondentType = x.RespondentType,//ผู้ถูกสืบสวน RespondentType = x.RespondentType,//ผู้ถูกสืบสวน
Persons = x.DisciplineDisciplinary_ProfileComplaintInvestigates.Where(x => x.IsReport == "NEW") Persons = x.DisciplineDisciplinary_ProfileComplaintInvestigates.Where(x => x.IsReport == "NEW")
.OrderByDescending(p => p.CreatedAt) .OrderByDescending(p => p.profileType)
.ThenByDescending(p => p.CreatedAt)
.Select(p => new .Select(p => new
{ {
Id = p.Id, Id = p.Id,

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

@ -131,7 +131,8 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
profileType = x.profileType, profileType = x.profileType,
CreatedAt = x.CreatedAt, CreatedAt = x.CreatedAt,
}) })
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.profileType == "OFFICER")
.ThenByDescending(x => x.CreatedAt)
.ThenByDescending(x => x.CitizenId) .ThenByDescending(x => x.CitizenId)
.Skip((page - 1) * pageSize) .Skip((page - 1) * pageSize)
.Take(pageSize) .Take(pageSize)