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

ปรับเหตุผลคำสั่งลาออก,โอนออก issue #1572

Browse source
This commit is contained in:
Bright 2025-06-11 12:05:46 +07:00
parent afb2cfa189
commit b528f0a81d
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -881,7 +881,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionType = p.PositionTypeOld, positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld, positionLevel = p.PositionLevelOld,
commandId = r.commandId, commandId = r.commandId,
leaveReason = "โอนออก", //leaveReason = "โอนออก",
leaveReason = string.IsNullOrWhiteSpace(p.Reason) ? "โอนออก" : p.Reason,
dateLeave = r.commandDateAffect, dateLeave = r.commandDateAffect,
isLeave = true, isLeave = true,
orgRoot = p.rootOld, orgRoot = p.rootOld,

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

@ -2630,7 +2630,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
positionType = p.PositionTypeOld, positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld, positionLevel = p.PositionLevelOld,
isLeave = p.IsCancel == true ? false : true, isLeave = p.IsCancel == true ? false : true,
leaveReason = "ออกจากราชการ", //leaveReason = "ออกจากราชการ",
leaveReason = p.ReasonResign == "อื่น ๆ"
? string.IsNullOrWhiteSpace(p.Remark) ? p.ReasonResign : $"{p.ReasonResign}({p.Remark})"
: p.ReasonResign,
dateLeave = r.commandDateAffect, dateLeave = r.commandDateAffect,
commandId = r.commandId, commandId = r.commandId,
isGovernment = false, isGovernment = false,

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

@ -2111,7 +2111,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
positionType = p.PositionTypeOld, positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld, positionLevel = p.PositionLevelOld,
isLeave = p.IsCancel == true ? false : true, isLeave = p.IsCancel == true ? false : true,
leaveReason = "ออกจากราชการ", //leaveReason = "ออกจากราชการ",
leaveReason = p.ReasonResign == "อื่น ๆ"
? string.IsNullOrWhiteSpace(p.Remark) ? p.ReasonResign : $"{p.ReasonResign}({p.Remark})"
: p.ReasonResign,
dateLeave = r.commandDateAffect, dateLeave = r.commandDateAffect,
commandId = r.commandId, commandId = r.commandId,
isGovernment = false, isGovernment = false,