ออกคำสั่งใหม่
This commit is contained in:
kittapath
parent
12aceb5e00
commit
e092604b97
15 changed files with 592 additions and 407 deletions
|
|
@ -908,30 +908,35 @@ namespace BMA.EHR.Placement.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.posMasterNo == null ? "" :
|
||||
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}" :
|
||||
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}" : "",
|
||||
position = p.position,
|
||||
positionLine = "",
|
||||
positionPathSide = "",
|
||||
positionExecutive = "",
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
|
||||
templateDoc = r.templateDoc,
|
||||
posmasterId = p.posmasterId,
|
||||
positionId = p.positionId,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandId = r.commandId,
|
||||
orgRoot = p.root,
|
||||
orgChild1 = p.child1,
|
||||
orgChild2 = p.child2,
|
||||
orgChild3 = p.child3,
|
||||
orgChild4 = p.child4,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
posNo = p.posMasterNo,
|
||||
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}" :
|
||||
p.node == 0 ? $"{p.rootShortName}" : "",
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
positionName = p.position,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1127,30 +1132,35 @@ namespace BMA.EHR.Placement.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.posMasterNo == null ? "" :
|
||||
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}" :
|
||||
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}" : "",
|
||||
position = p.position,
|
||||
positionLine = "",
|
||||
positionPathSide = "",
|
||||
positionExecutive = "",
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
|
||||
templateDoc = r.templateDoc,
|
||||
posmasterId = p.posmasterId,
|
||||
positionId = p.positionId,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandId = r.commandId,
|
||||
orgRoot = p.root,
|
||||
orgChild1 = p.child1,
|
||||
orgChild2 = p.child2,
|
||||
orgChild3 = p.child3,
|
||||
orgChild4 = p.child4,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
posNo = p.posMasterNo,
|
||||
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}" :
|
||||
p.node == 0 ? $"{p.rootShortName}" : "",
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
positionName = p.position,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1337,27 +1347,34 @@ namespace BMA.EHR.Placement.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.posMasterNo == null ? "" :
|
||||
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}" :
|
||||
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}" : "",
|
||||
position = p.position,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
|
||||
templateDoc = r.templateDoc,
|
||||
posmasterId = p.posmasterId,
|
||||
positionId = p.positionId,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandId = r.commandId,
|
||||
orgRoot = p.root,
|
||||
orgChild1 = p.child1,
|
||||
orgChild2 = p.child2,
|
||||
orgChild3 = p.child3,
|
||||
orgChild4 = p.child4,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
posNo = p.posMasterNo,
|
||||
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}" :
|
||||
p.node == 0 ? $"{p.rootShortName}" : "",
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
positionName = p.position,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1549,27 +1566,34 @@ namespace BMA.EHR.Placement.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.posMasterNo == null ? "" :
|
||||
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}" :
|
||||
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}" : "",
|
||||
position = p.position,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
|
||||
templateDoc = r.templateDoc,
|
||||
posmasterId = p.posmasterId,
|
||||
positionId = p.positionId,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandId = r.commandId,
|
||||
orgRoot = p.root,
|
||||
orgChild1 = p.child1,
|
||||
orgChild2 = p.child2,
|
||||
orgChild3 = p.child3,
|
||||
orgChild4 = p.child4,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
posNo = p.posMasterNo,
|
||||
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}" :
|
||||
p.node == 0 ? $"{p.rootShortName}" : "",
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
positionName = p.position,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1777,30 +1801,35 @@ namespace BMA.EHR.Placement.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.posMasterNo == null ? "" :
|
||||
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}" :
|
||||
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}" : "",
|
||||
position = p.position,
|
||||
positionLine = "",
|
||||
positionPathSide = "",
|
||||
positionExecutive = "",
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
|
||||
templateDoc = r.templateDoc,
|
||||
posmasterId = p.posmasterId,
|
||||
positionId = p.positionId,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandId = r.commandId,
|
||||
orgRoot = p.root,
|
||||
orgChild1 = p.child1,
|
||||
orgChild2 = p.child2,
|
||||
orgChild3 = p.child3,
|
||||
orgChild4 = p.child4,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
posNo = p.posMasterNo,
|
||||
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
|
||||
p.node == 3 ? $"{p.child3ShortName}" :
|
||||
p.node == 2 ? $"{p.child2ShortName}" :
|
||||
p.node == 1 ? $"{p.child1ShortName}" :
|
||||
p.node == 0 ? $"{p.rootShortName}" : "",
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
positionName = p.position,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue