ออกคำสั่งใหม่
This commit is contained in:
kittapath
parent
12aceb5e00
commit
e092604b97
15 changed files with 592 additions and 407 deletions
|
|
@ -539,7 +539,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
detail = data.DisciplineDisciplinary.Title,
|
||||
level = data.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
refCommandDate = DateTime.Now,
|
||||
refCommandNo = $"{d.commandNo}/{d.commandYear}",
|
||||
refCommandNo = $"{d.commandNo}/{d.commandYear?.ToThaiYear()}",
|
||||
unStigma = d.detail,
|
||||
});
|
||||
var _result = await _res.Content.ReadAsStringAsync();
|
||||
|
|
@ -586,7 +586,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
detail = data.DisciplineDisciplinary.Title,
|
||||
level = data.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
refCommandDate = DateTime.Now,
|
||||
refCommandNo = $"{d.commandNo}/{d.commandYear}",
|
||||
refCommandNo = $"{d.commandNo}/{d.commandYear?.ToThaiYear()}",
|
||||
unStigma = d.detail,
|
||||
});
|
||||
var _result = await _res.Content.ReadAsStringAsync();
|
||||
|
|
@ -632,7 +632,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
detail = data1.DisciplineInvestigate.Title,
|
||||
level = "",
|
||||
refCommandDate = DateTime.Now,
|
||||
refCommandNo = $"{d.commandNo}/{d.commandYear}",
|
||||
refCommandNo = $"{d.commandNo}/{d.commandYear?.ToThaiYear()}",
|
||||
unStigma = d.detail,
|
||||
});
|
||||
var _result = await _res.Content.ReadAsStringAsync();
|
||||
|
|
@ -660,7 +660,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
detail = data2.DisciplineDisciplinary.Title,
|
||||
level = data2.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
refCommandDate = DateTime.Now,
|
||||
refCommandNo = $"{d.commandNo}/{d.commandYear}",
|
||||
refCommandNo = $"{d.commandNo}/{d.commandYear?.ToThaiYear()}",
|
||||
unStigma = d.detail,
|
||||
});
|
||||
var _result = await _res.Content.ReadAsStringAsync();
|
||||
|
|
@ -815,25 +815,26 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = true,
|
||||
leaveReason = "ได้รับโทษทางวินัย ปลดออกจากราชการ",
|
||||
dateLeave = r.commandAffectDate,
|
||||
refCommandDate = DateTime.Now,
|
||||
dateLeave = r.commandDateAffect,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งลงโทษ ปลดออกจากราชการ",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
isGovernment = false,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -943,25 +944,26 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = true,
|
||||
leaveReason = "ได้รับโทษทางวินัย ออกจากราชการ",
|
||||
dateLeave = r.commandAffectDate,
|
||||
refCommandDate = DateTime.Now,
|
||||
leaveReason = "ได้รับโทษทางวินัย ไล่ออกจากราชการ",
|
||||
dateLeave = r.commandDateAffect,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งลงโทษ ไล่ออกจากราชการ",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
isGovernment = false,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1149,25 +1151,26 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = true,
|
||||
leaveReason = "ได้รับโทษทางวินัย พักจากราชการ",
|
||||
dateLeave = r.commandAffectDate,
|
||||
refCommandDate = DateTime.Now,
|
||||
dateLeave = r.commandDateAffect,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งลงโทษ พักจากราชการ",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
isGovernment = false,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1266,25 +1269,26 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = true,
|
||||
leaveReason = "ได้รับโทษทางวินัย ให้ออกจากราชการไว้ก่อน",
|
||||
dateLeave = r.commandAffectDate,
|
||||
refCommandDate = DateTime.Now,
|
||||
dateLeave = r.commandDateAffect,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งลงโทษ ให้ออกจากราชการไว้ก่อน",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
isGovernment = false,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1382,24 +1386,25 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = _null,
|
||||
leaveReason = _null,
|
||||
dateLeave = _null,
|
||||
refCommandDate = DateTime.Now,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งลงโทษ ลงโทษ ภาคทัณฑ์",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1497,24 +1502,25 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = _null,
|
||||
leaveReason = _null,
|
||||
dateLeave = _null,
|
||||
refCommandDate = DateTime.Now,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งลงโทษ ตัดเงินเดือน",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1612,24 +1618,25 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = _null,
|
||||
leaveReason = _null,
|
||||
dateLeave = _null,
|
||||
refCommandDate = DateTime.Now,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งลงโทษ ลดขั้นเงินเดือน",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1727,24 +1734,25 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = _null,
|
||||
leaveReason = _null,
|
||||
dateLeave = _null,
|
||||
refCommandDate = DateTime.Now,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งเพิ่มโทษ",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1842,24 +1850,25 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = _null,
|
||||
leaveReason = _null,
|
||||
dateLeave = _null,
|
||||
refCommandDate = DateTime.Now,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งงดโทษ",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
|
|
@ -1973,24 +1982,25 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
commandId = r.commandId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = false,
|
||||
leaveReason = _null,
|
||||
dateLeave = _null,
|
||||
refCommandDate = DateTime.Now,
|
||||
detail = p.DisciplineInvestigate.Title,
|
||||
level = "",
|
||||
unStigma = "คำสั่งยุติเรื่อง",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
profileType = p.profileType,
|
||||
refCommandCode = r.refCommandCode,
|
||||
refCommandName = r.refCommandName,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-leave-discipline";
|
||||
|
|
@ -2021,16 +2031,25 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
select new
|
||||
{
|
||||
profileId = p.PersonId,
|
||||
date = r.commandAffectDate,
|
||||
refCommandNo = $"{r.commandNo}/{r.commandYear}",
|
||||
salaryRef = r.templateDoc,
|
||||
profileType = p.profileType,
|
||||
isLeave = false,
|
||||
leaveReason = _null,
|
||||
dateLeave = _null,
|
||||
refCommandDate = DateTime.Now,
|
||||
detail = p.DisciplineDisciplinary.Title,
|
||||
level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
|
||||
unStigma = "คำสั่งยุติเรื่อง"
|
||||
unStigma = "คำสั่งยุติเรื่อง",
|
||||
commandId = r.commandId,
|
||||
amount = r.amount,
|
||||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
commandNo = r.commandNo,
|
||||
commandYear = r.commandYear,
|
||||
commandDateAffect = r.commandDateAffect,
|
||||
commandDateSign = r.commandDateSign,
|
||||
commandCode = r.commandCode,
|
||||
commandName = r.commandName,
|
||||
remark = r.remark,
|
||||
}).ToList();
|
||||
using (var client = new HttpClient())
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue