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 2025-02-21 19:11:20 +07:00
parent 12aceb5e00
commit e092604b97
15 changed files with 592 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -701,27 +701,37 @@ namespace BMA.EHR.Retirement.Service.Controllers
select new
{
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
position = p.PositionOld,
positionLine = "",
positionPathSide = "",
positionExecutive = "",
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isLeave = false,
leaveReason = _null,
dateLeave = _null,
commandId = r.commandId,
isGovernment = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
orgRoot = p.rootOld,
orgChild1 = p.child1Old,
orgChild2 = p.child2Old,
orgChild3 = p.child3Old,
orgChild4 = p.child4Old,
commandNo = r.commandNo,
commandYear = r.commandYear,
posNo = p.posMasterNoOld,
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
p.child1ShortNameOld != null ? $"{p.child1ShortNameOld}" :
p.rootShortNameOld != null ? $"{p.rootShortNameOld}" : "",
commandDateAffect = r.commandDateAffect,
commandDateSign = r.commandDateSign,
positionName = p.PositionOld,
commandCode = r.commandCode,
commandName = r.commandName,
remark = r.remark,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -911,27 +921,37 @@ namespace BMA.EHR.Retirement.Service.Controllers
select new
{
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
position = p.PositionOld,
positionLine = "",
positionPathSide = "",
positionExecutive = "",
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isLeave = false,
leaveReason = _null,
dateLeave = _null,
commandId = r.commandId,
isGovernment = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
orgRoot = p.rootOld,
orgChild1 = p.child1Old,
orgChild2 = p.child2Old,
orgChild3 = p.child3Old,
orgChild4 = p.child4Old,
commandNo = r.commandNo,
commandYear = r.commandYear,
posNo = p.posMasterNoOld,
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
p.child1ShortNameOld != null ? $"{p.child1ShortNameOld}" :
p.rootShortNameOld != null ? $"{p.rootShortNameOld}" : "",
commandDateAffect = r.commandDateAffect,
commandDateSign = r.commandDateSign,
positionName = p.PositionOld,
commandCode = r.commandCode,
commandName = r.commandName,
remark = r.remark,
}).ToList();
var baseAPIOrg = _configuration["API"];

32
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -554,27 +554,37 @@ namespace BMA.EHR.Retirement.Service.Controllers
select new
{
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
position = p.PositionOld,
positionLine = "",
positionPathSide = "",
positionExecutive = "",
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isLeave = true,
leaveReason = "ให้ออกจากราชการ",
dateLeave = r.commandAffectDate,
dateLeave = r.commandDateAffect,
commandId = r.commandId,
isGovernment = false,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
orgRoot = p.rootOld,
orgChild1 = p.child1Old,
orgChild2 = p.child2Old,
orgChild3 = p.child3Old,
orgChild4 = p.child4Old,
commandNo = r.commandNo,
commandYear = r.commandYear,
posNo = p.posMasterNoOld,
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
p.child1ShortNameOld != null ? $"{p.child1ShortNameOld}" :
p.rootShortNameOld != null ? $"{p.rootShortNameOld}" : "",
commandDateAffect = r.commandDateAffect,
commandDateSign = r.commandDateSign,
positionName = p.PositionOld,
commandCode = r.commandCode,
commandName = r.commandName,
remark = r.remark,
}).ToList();
var baseAPIOrg = _configuration["API"];

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

@ -2232,27 +2232,37 @@ namespace BMA.EHR.Retirement.Service.Controllers
select new
{
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
position = p.PositionOld,
positionLine = "",
positionPathSide = "",
positionExecutive = "",
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isLeave = true,
isGovernment = false,
leaveReason = "ออกจากราชการ",
dateLeave = r.commandAffectDate,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
dateLeave = r.commandDateAffect,
commandId = r.commandId,
isGovernment = false,
orgRoot = p.rootOld,
orgChild1 = p.child1Old,
orgChild2 = p.child2Old,
orgChild3 = p.child3Old,
orgChild4 = p.child4Old,
commandNo = r.commandNo,
commandYear = r.commandYear,
posNo = p.posMasterNoOld,
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
p.child1ShortNameOld != null ? $"{p.child1ShortNameOld}" :
p.rootShortNameOld != null ? $"{p.rootShortNameOld}" : "",
commandDateAffect = r.commandDateAffect,
commandDateSign = r.commandDateSign,
positionName = p.PositionOld,
commandCode = r.commandCode,
commandName = r.commandName,
remark = r.remark,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -2421,26 +2431,37 @@ namespace BMA.EHR.Retirement.Service.Controllers
select new
{
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
position = p.PositionOld,
positionLine = "",
positionPathSide = "",
positionExecutive = "",
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isLeave = false,
leaveReason = _null,
dateLeave = _null,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
commandId = r.commandId,
isGovernment = false,
orgRoot = p.rootOld,
orgChild1 = p.child1Old,
orgChild2 = p.child2Old,
orgChild3 = p.child3Old,
orgChild4 = p.child4Old,
commandNo = r.commandNo,
commandYear = r.commandYear,
posNo = p.posMasterNoOld,
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
p.child1ShortNameOld != null ? $"{p.child1ShortNameOld}" :
p.rootShortNameOld != null ? $"{p.rootShortNameOld}" : "",
commandDateAffect = r.commandDateAffect,
commandDateSign = r.commandDateSign,
positionName = p.PositionOld,
commandCode = r.commandCode,
commandName = r.commandName,
remark = r.remark,
}).ToList();
var baseAPIOrg = _configuration["API"];

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

@ -1676,27 +1676,36 @@ namespace BMA.EHR.Retirement.Service.Controllers
select new
{
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
position = p.PositionOld,
// positionLine = "",
// positionPathSide = "",
// positionExecutive = "",
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isLeave = true,
isGovernment = false,
leaveReason = "ออกจากราชการ",
dateLeave = r.commandAffectDate,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
dateLeave = r.commandDateAffect,
commandId = r.commandId,
isGovernment = false,
orgRoot = p.rootOld,
orgChild1 = p.child1Old,
orgChild2 = p.child2Old,
orgChild3 = p.child3Old,
orgChild4 = p.child4Old,
commandNo = r.commandNo,
commandYear = r.commandYear,
posNo = p.posMasterNoOld,
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
p.child1ShortNameOld != null ? $"{p.child1ShortNameOld}" :
p.rootShortNameOld != null ? $"{p.rootShortNameOld}" : "",
commandDateAffect = r.commandDateAffect,
commandDateSign = r.commandDateSign,
positionName = p.PositionOld,
commandCode = r.commandCode,
commandName = r.commandName,
remark = r.remark,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1865,26 +1874,37 @@ namespace BMA.EHR.Retirement.Service.Controllers
select new
{
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
position = p.PositionOld,
positionLine = "",
positionPathSide = "",
positionExecutive = "",
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isLeave = false,
leaveReason = _null,
dateLeave = _null,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
commandId = r.commandId,
isGovernment = false,
orgRoot = p.rootOld,
orgChild1 = p.child1Old,
orgChild2 = p.child2Old,
orgChild3 = p.child3Old,
orgChild4 = p.child4Old,
commandNo = r.commandNo,
commandYear = r.commandYear,
posNo = p.posMasterNoOld,
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
p.child1ShortNameOld != null ? $"{p.child1ShortNameOld}" :
p.rootShortNameOld != null ? $"{p.rootShortNameOld}" : "",
commandDateAffect = r.commandDateAffect,
commandDateSign = r.commandDateSign,
positionName = p.PositionOld,
commandCode = r.commandCode,
commandName = r.commandName,
remark = r.remark,
}).ToList();
var baseAPIOrg = _configuration["API"];

11
BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs
View file

@ -10,16 +10,17 @@ namespace BMA.EHR.Retirement.Service.Requests
public class ReportExecuteRequestObj
{
public string? refId { get; set; }
public DateTime commandAffectDate { get; set; }
public string? commandNo { get; set; }
public string? commandId { get; set; }
public int commandYear { get; set; }
public string? templateDoc { get; set; }
public string? commandId { get; set; }
public string? remark { get; set; }
public double? amount { get; set; }
public double? amountSpecial { get; set; }
public double? positionSalaryAmount { get; set; }
public double? mouthSalaryAmount { get; set; }
public string? refCommandCode { get; set; }
public string? refCommandName { get; set; }
public string? commandCode { get; set; }
public string? commandName { get; set; }
public DateTime commandDateAffect { get; set; }
public DateTime commandDateSign { get; set; }
}
}