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

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

@ -286,7 +286,7 @@ namespace BMA.EHR.DisciplineInvestigate.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,
@ -317,7 +317,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
IsSend = p.IsReport,
IsDisciplinary = p.IsDisciplinary,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
Organization = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
OrganizationId = x.OrganizationId,//id หน่วยงานกรณี type เป็นหน่วยงาน
DisciplineInvestigateDocs = x.DisciplineInvestigate_Docs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
DisciplineInvestigateRelevantDocs = x.DisciplineInvestigateRelevant_Docs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
@ -368,6 +369,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
_data.Director,
_data.RespondentType,
_data.Persons,
_data.Organization,
_data.OrganizationId,
disciplineInvestigateDocs,
disciplineInvestigateRelevantDocs,
@ -457,7 +459,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
);
}
}
data.Organization = req.organizationId;
data.Organization = req.organization;
data.OrganizationId = req.organizationId;
data.RespondentType = req.respondentType;
var hisprofile = data.DisciplineInvestigate_ProfileComplaints;
_context.DisciplineInvestigate_ProfileComplaints.RemoveRange(data.DisciplineInvestigate_ProfileComplaints);
@ -475,7 +478,7 @@ namespace BMA.EHR.DisciplineInvestigate.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,
@ -578,6 +581,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
RespondentType = data.RespondentType.Trim().ToUpper(),
Organization = data.Organization,
ConsideredAgency = data.ConsideredAgency,
OrganizationId = data.OrganizationId,
ConsideredAgencyId = data.ConsideredAgencyId,
Title = data.Title,
Description = data.Description,
DateReceived = data.DateReceived,
@ -646,7 +651,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
Salary = item.Salary,
PosNo = item.PosNo,
Position = item.Position,
PositionLevel = item.PositionLevel,
// PositionLevel = item.PositionLevel,
IsAncestorDNA = true,
Status = "NEW",
StatusDiscard = "NEW",