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

fix เลือกตำแหน่งในสายงานหาย เมื่อมีการเปลี่ยนแปลงข้อมูลตำแหน่งในโครงสร้าง #2505

Browse source
This commit is contained in:
harid 2026-05-21 16:47:19 +07:00
parent 22e04d90fe
commit 02abedc973
8 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -676,6 +676,7 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.posMasterNo = req.posMasterNo; uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName; uppdated.position = req.positionName;
uppdated.PositionExecutive = req.posExecutiveName; uppdated.PositionExecutive = req.posExecutiveName;
uppdated.posExecutiveId = req.posExecutiveId;
uppdated.positionExecutiveField = req.positionExecutiveField; uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea; uppdated.positionArea = req.positionArea;
uppdated.positionField = req.positionField; uppdated.positionField = req.positionField;
@ -1014,6 +1015,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName, positionLevel = p.posLevelName,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId, commandId = r.commandId,
orgRoot = p.root, orgRoot = p.root,
orgChild1 = p.child1, orgChild1 = p.child1,
@ -1226,6 +1229,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName, positionLevel = p.posLevelName,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId, commandId = r.commandId,
orgRoot = p.root, orgRoot = p.root,
orgChild1 = p.child1, orgChild1 = p.child1,
@ -1855,6 +1860,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName, positionLevel = p.posLevelName,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId, commandId = r.commandId,
orgRoot = p.root, orgRoot = p.root,
orgChild1 = p.child1, orgChild1 = p.child1,
@ -2016,6 +2023,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName, positionLevel = p.posLevelName,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId, commandId = r.commandId,
orgRoot = p.root, orgRoot = p.root,
orgChild1 = p.child1, orgChild1 = p.child1,

29
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -1065,6 +1065,7 @@ namespace BMA.EHR.Placement.Service.Controllers
person.positionId = req.positionId; person.positionId = req.positionId;
person.posMasterNo = req.posMasterNo; person.posMasterNo = req.posMasterNo;
person.positionName = req.positionName; person.positionName = req.positionName;
person.posExecutiveId = req.posExecutiveId;
person.PositionExecutive = req.posExecutiveName; person.PositionExecutive = req.posExecutiveName;
person.positionExecutiveField = req.positionExecutiveField; person.positionExecutiveField = req.positionExecutiveField;
person.positionArea = req.positionArea; person.positionArea = req.positionArea;
@ -1453,6 +1454,10 @@ namespace BMA.EHR.Placement.Service.Controllers
profile.posTypeName = null; profile.posTypeName = null;
profile.posLevelId = null; profile.posLevelId = null;
profile.posLevelName = null; profile.posLevelName = null;
profile.PositionExecutive = null;
profile.posExecutiveId = null;
profile.positionArea = null;
profile.positionExecutiveField = null;
// profile.PositionLevel = null; // profile.PositionLevel = null;
// profile.PositionType = null; // profile.PositionType = null;
@ -1936,7 +1941,14 @@ namespace BMA.EHR.Placement.Service.Controllers
bodyPosition = new bodyPosition = new
{ {
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId positionId = p.positionId,
positionName = p.positionName,
positionField = p.positionField,
posTypeId = p.posTypeId,
posLevelId = p.posLevelId,
posExecutiveId = p.posExecutiveId,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
}, },
bodyMarry = new bodyMarry = new
{ {
@ -2292,7 +2304,14 @@ namespace BMA.EHR.Placement.Service.Controllers
bodyPosition = new bodyPosition = new
{ {
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId positionId = p.positionId,
positionName = p.positionName,
positionField = p.positionField,
posTypeId = p.posTypeId,
posLevelId = p.posLevelId,
posExecutiveId = p.posExecutiveId,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
}, },
bodyMarry = new bodyMarry = new
{ {
@ -2563,6 +2582,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName, positionLevel = p.posLevelName,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId, commandId = r.commandId,
orgRoot = p.root, orgRoot = p.root,
orgChild1 = p.child1, orgChild1 = p.child1,
@ -2804,6 +2825,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName, positionLevel = p.posLevelName,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId, commandId = r.commandId,
orgRoot = p.root, orgRoot = p.root,
orgChild1 = p.child1, orgChild1 = p.child1,
@ -3030,6 +3053,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName, positionLevel = p.posLevelName,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId, commandId = r.commandId,
orgRoot = p.root, orgRoot = p.root,
orgChild1 = p.child1, orgChild1 = p.child1,

12
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -782,6 +782,7 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.posMasterNo = req.posMasterNo; uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName; uppdated.position = req.positionName;
uppdated.PositionExecutive = req.posExecutiveName; uppdated.PositionExecutive = req.posExecutiveName;
uppdated.posExecutiveId = req.posExecutiveId;
uppdated.positionExecutiveField = req.positionExecutiveField; uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea; uppdated.positionArea = req.positionArea;
uppdated.positionField = req.positionField; uppdated.positionField = req.positionField;
@ -1216,8 +1217,15 @@ namespace BMA.EHR.Placement.Service.Controllers
}, },
bodyPosition = new bodyPosition = new
{ {
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId positionId = p.positionId,
positionName = p.position,
positionField = p.positionField,
posTypeId = p.posTypeId,
posLevelId = p.posLevelId,
posExecutiveId = p.posExecutiveId,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
} }
}).ToList(); }).ToList();

1
BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs
View file

@ -30,6 +30,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelName { get; set; } public string? posLevelName { get; set; }
public string? typeCommand { get; set; } public string? typeCommand { get; set; }
public string? posExecutiveName { get; set; } public string? posExecutiveName { get; set; }
public string? posExecutiveId { get; set; }
public string? positionExecutiveField { get; set; } public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; } public string? positionArea { get; set; }
} }

1
BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs
View file

@ -30,6 +30,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelName { get; set; } public string? posLevelName { get; set; }
public string? typeCommand { get; set; } public string? typeCommand { get; set; }
public string? posExecutiveName { get; set; } public string? posExecutiveName { get; set; }
public string? posExecutiveId { get; set; }
public string? positionExecutiveField { get; set; } public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; } public string? positionArea { get; set; }
} }

1
BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs
View file

@ -39,6 +39,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelName { get; set; } public string? posLevelName { get; set; }
public string? typeCommand { get; set; } public string? typeCommand { get; set; }
public string? posExecutiveName { get; set; } public string? posExecutiveName { get; set; }
public string? posExecutiveId { get; set; }
public string? positionExecutiveField { get; set; } public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; } public string? positionArea { get; set; }

5
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -569,6 +569,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
uppdated.positionId = req.positionId; uppdated.positionId = req.positionId;
uppdated.posMasterNo = req.posMasterNo; uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName; uppdated.position = req.positionName;
uppdated.posExecutiveId = req.posExecutiveId;
uppdated.PositionExecutive = req.posExecutiveName; uppdated.PositionExecutive = req.posExecutiveName;
uppdated.positionExecutiveField = req.positionExecutiveField; uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea; uppdated.positionArea = req.positionArea;
@ -889,6 +890,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
commandCode = r.commandCode, commandCode = r.commandCode,
commandName = r.commandName, commandName = r.commandName,
remark = r.remark, remark = r.remark,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
positionTypeNew = p.posTypeId, positionTypeNew = p.posTypeId,
positionLevelNew = p.posLevelId, positionLevelNew = p.posLevelId,
positionNameNew = p.position, positionNameNew = p.position,
@ -1138,6 +1141,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
commandCode = r.commandCode, commandCode = r.commandCode,
commandName = r.commandName, commandName = r.commandName,
remark = r.remark, remark = r.remark,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
positionTypeNew = p.posTypeId, positionTypeNew = p.posTypeId,
positionLevelNew = p.posLevelId, positionLevelNew = p.posLevelId,
positionNameNew = p.position, positionNameNew = p.position,

1
BMA.EHR.Retirement.Service/Requests/PersonSelectPositionOtherRequest.cs
View file

@ -29,6 +29,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public string? posLevelId { get; set; } public string? posLevelId { get; set; }
public string? posLevelName { get; set; } public string? posLevelName { get; set; }
public string? typeCommand { get; set; } public string? typeCommand { get; set; }
public string? posExecutiveId { get; set; }
public string? posExecutiveName { get; set; } public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; } public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; } public string? positionArea { get; set; }