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

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

@ -140,7 +140,7 @@ namespace BMA.EHR.DisciplineComplaint.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,
@ -168,8 +168,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
posLevelId = p.posLevelId,
posLevelName = p.posLevelName,
}),//รายการข้อมูลบุคลผู้ถูกร้องเรียน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
Organization = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
ConsideredAgency = x.ConsideredAgency,//หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
OrganizationId = x.OrganizationId,//id หน่วยงานกรณี type เป็นหน่วยงาน
ConsideredAgencyId = x.ConsideredAgencyId,//หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
activeId = x.activeId,
Title = x.Title,//ชื่อเรื่อง
Description = x.Description,//รายละเอียด
DateReceived = x.DateReceived,//วันที่รับเรื่อง
@ -204,8 +207,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
_data.Id,
_data.RespondentType,
_data.Persons,
_data.OrganizationId,
_data.Organization,
_data.ConsideredAgency,
_data.OrganizationId,
_data.ConsideredAgencyId,
_data.activeId,
_data.Title,
_data.Description,
_data.DateReceived,
@ -236,8 +242,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
var disciplineComplaint = new Domain.Models.Discipline.DisciplineComplaint
{
RespondentType = req.respondentType.Trim().ToUpper(),
Organization = req.organizationId,
Organization = req.organization,
ConsideredAgency = req.consideredAgency,
OrganizationId = req.organizationId,
ConsideredAgencyId = req.consideredAgencyId,
activeId = req.activeId,
Title = req.title,
Description = req.description,
DateReceived = req.dateReceived,
@ -292,7 +301,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
Salary = item.salary,
PosNo = item.posNo,
Position = item.position,
PositionLevel = item.positionLevel,
// PositionLevel = item.positionLevel,
IsAncestorDNA = true,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -333,8 +342,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
return Error(new Exception("ไม่สามารถแก้ไขข้อมูลนี้ได้"), StatusCodes.Status500InternalServerError);
data.RespondentType = req.respondentType.Trim().ToUpper();
data.Organization = req.organizationId;
data.Organization = req.organization;
data.ConsideredAgency = req.consideredAgency;
data.OrganizationId = req.organizationId;
data.ConsideredAgencyId = req.consideredAgencyId;
data.activeId = req.activeId;
data.Title = req.title;
data.Description = req.description;
data.DateReceived = req.dateReceived;
@ -362,7 +374,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
LastName = item.lastName,
Organization = item.organization,
Position = item.position,
PositionLevel = item.positionLevel,
// PositionLevel = item.positionLevel,
IsAncestorDNA = true,
Salary = item.salary,
PersonId = item.personId,
@ -481,6 +493,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
RespondentType = data.RespondentType.Trim().ToUpper(),
Organization = data.Organization,
ConsideredAgency = data.ConsideredAgency,
OrganizationId = data.OrganizationId,
ConsideredAgencyId = data.ConsideredAgencyId,
activeId = data.activeId,
Title = data.Title,
Description = data.Description,
DateReceived = data.DateReceived,
@ -539,7 +554,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
Salary = item.Salary,
PosNo = item.PosNo,
Position = item.Position,
PositionLevel = item.PositionLevel,
// PositionLevel = item.PositionLevel,
IsAncestorDNA = true,
IsDisciplinary = false,
CreatedFullName = FullName ?? "System Administrator",