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

เพิ่มลูกจ้างวินัย #874
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
Bright 2024-12-18 11:02:24 +07:00
parent 72a7a73673
commit b042f471b4
8 changed files with 54 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -480,7 +480,9 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
// Total = d.DisciplineDirector.DisciplineDisciplinary_DirectorInvestigates.Count(),
}).ToList(),
RespondentType = x.RespondentType,//ผู้ถูกสืบสวน
Persons = x.DisciplineDisciplinary_ProfileComplaintInvestigates.Select(p => new
Persons = x.DisciplineDisciplinary_ProfileComplaintInvestigates
.OrderByDescending(p => p.CreatedAt)
.Select(p => new
{
Id = p.Id,
Idcard = p.CitizenId,
@ -516,11 +518,13 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
posTypeName = p.posTypeName,
posLevelId = p.posLevelId,
posLevelName = p.posLevelName,
IsSend = p.IsReport,
IsSuspend = p.IsSuspend,
Status = p.Status,
StatusDiscard = p.StatusDiscard,
profileType = p.profileType,
CreatedAt = p.CreatedAt,
// Report = p.DisciplineReport_Profiles.Count() > 0 ? true : false,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
Organization = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
@ -775,7 +779,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
posTypeName = item.posTypeName,
posLevelId = item.posLevelId,
posLevelName = item.posLevelName,
profileType = item.profileType,
PosNo = item.posNo,
Status = isReport == null ? "NEW" : isReport.Status,
StatusDiscard = isReport == null ? "NEW" : isReport.StatusDiscard,
@ -1766,7 +1770,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
posTypeName = item.posTypeName,
posLevelId = item.posLevelId,
posLevelName = item.posLevelName,
profileType = item.profileType,
Salary = item.Salary,
PosNo = item.PosNo,
Position = item.Position,