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-05-29 16:29:12 +07:00
parent b7f19d7077
commit 1828685e0e
50 changed files with 37955 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -458,7 +458,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
FirstName = p.FirstName,
LastName = p.LastName,
Position = p.Position,
PositionLevel = p.PositionLevel,
// PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary,
PersonId = p.PersonId,
@ -492,7 +492,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
StatusDiscard = p.StatusDiscard,
// Report = p.DisciplineReport_Profiles.Count() > 0 ? true : false,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
Organization = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
OrganizationId = x.OrganizationId,//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 }),
@ -589,6 +590,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
_data.Director,
_data.RespondentType,
_data.Persons,
_data.Organization,
_data.OrganizationId,
_data.DisciplinaryFaultLevelOther,
disciplineDisciplinary_DocRelevants,
@ -692,7 +694,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
);
}
}
data.Organization = req.organizationId;
data.Organization = req.organization;
data.OrganizationId = req.organizationId;
data.RespondentType = req.respondentType;
var hisprofile = data.DisciplineDisciplinary_ProfileComplaintInvestigates;
_context.DisciplineDisciplinary_ProfileComplaintInvestigates.RemoveRange(data.DisciplineDisciplinary_ProfileComplaintInvestigates);
@ -710,7 +713,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
LastName = item.lastName,
Organization = item.organization,
Position = item.position,
PositionLevel = item.positionLevel,
// PositionLevel = item.positionLevel,
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
Salary = item.salary,
PersonId = item.personId,
@ -1689,7 +1692,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
Salary = item.Salary,
PosNo = item.PosNo,
Position = item.Position,
PositionLevel = item.PositionLevel,
PositionLevel = item.posLevelName,
PositionType = item.posTypeName,
Title = data.Title,
OffenseDetails = data.OffenseDetails,
DisciplinaryCaseFault = data.DisciplinaryCaseFault,