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

no message

Browse source
This commit is contained in:
kittapath 2025-01-09 11:50:36 +07:00
parent 74f05fccfe
commit 5604d7076e
14 changed files with 92 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

48
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -824,6 +824,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false, isGovernment = false,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -922,6 +924,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false, isGovernment = false,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1021,17 +1025,17 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
.ToListAsync(); .ToListAsync();
var report_data = (from p in data var report_data = (from p in data
join r in req.refIds join r in req.refIds
on p.Id.ToString() equals r.refId on p.Id.ToString() equals r.refId
select new select new
{ {
fullName = $"{r.Prefix}{r.FirstName} {r.LastName}", fullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
positionname = p.Position, positionname = p.Position,
positionno = p.PosNo, positionno = p.PosNo,
organizationname = p.Organization, organizationname = p.Organization,
salary = r.Amount, salary = r.Amount,
RemarkHorizontal = r.RemarkHorizontal RemarkHorizontal = r.RemarkHorizontal
}).ToList(); }).ToList();
var result = new List<dynamic>(); var result = new List<dynamic>();
@ -1039,8 +1043,10 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
result.Add(new { {
result.Add(new
{
fullName = _null, fullName = _null,
positionname = r.RemarkHorizontal, positionname = r.RemarkHorizontal,
positionno = _null, positionno = _null,
@ -1095,6 +1101,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false, isGovernment = false,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1209,6 +1217,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false, isGovernment = false,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1321,6 +1331,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1433,6 +1445,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1545,6 +1559,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1657,6 +1673,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1769,6 +1787,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1897,6 +1917,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType, profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-leave-discipline"; var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-leave-discipline";

2
BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs
View file

@ -18,5 +18,7 @@ namespace BMA.EHR.Discipline.Service.Requests
public double? amount { get; set; } public double? amount { get; set; }
public double? positionSalaryAmount { get; set; } public double? positionSalaryAmount { get; set; }
public double? mouthSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; }
public string? refCommandCode { get; set; }
public string? refCommandName { get; set; }
} }
} }

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

@ -919,6 +919,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1132,6 +1134,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1333,6 +1337,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1539,6 +1545,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1764,6 +1772,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -1735,7 +1735,9 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName, positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
isGovernment = true isGovernment = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}, },
bodyPosition = new bodyPosition = new
{ {
@ -2040,7 +2042,9 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName, positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
isGovernment = true isGovernment = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}, },
bodyPosition = new bodyPosition = new
{ {
@ -2285,6 +2289,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -2514,6 +2520,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -2732,6 +2740,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
positionId = p.positionId, positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

5
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -628,7 +628,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -685,6 +686,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.PositionLevelOld, positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -1089,7 +1089,9 @@ namespace BMA.EHR.Placement.Service.Controllers
positionType = p.posTypeName == null ? string.Empty : p.posTypeName, positionType = p.posTypeName == null ? string.Empty : p.posTypeName,
positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName, positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc templateDoc = r.templateDoc,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}, },
bodyPosition = new bodyPosition = new
{ {

2
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -511,6 +511,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.PositionLevelOld, positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc, templateDoc = r.templateDoc,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -838,7 +838,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -903,6 +904,8 @@ namespace BMA.EHR.Placement.Service.Controllers
leaveReason = "โอนออก", leaveReason = "โอนออก",
dateLeave = r.commandAffectDate, dateLeave = r.commandAffectDate,
isLeave = true, isLeave = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

2
BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs
View file

@ -19,5 +19,7 @@ namespace BMA.EHR.Placement.Service.Requests
public double? amountSpecial { get; set; } public double? amountSpecial { get; set; }
public double? positionSalaryAmount { get; set; } public double? positionSalaryAmount { get; set; }
public double? mouthSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; }
public string? refCommandCode { get; set; }
public string? refCommandName { get; set; }
} }
} }

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

@ -794,6 +794,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
leaveReason = _null, leaveReason = _null,
dateLeave = _null, dateLeave = _null,
isGovernment = true, isGovernment = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1001,7 +1003,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = false, isLeave = false,
leaveReason = _null, leaveReason = _null,
dateLeave = _null, dateLeave = _null,
isGovernment = true isGovernment = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -547,7 +547,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = true, isLeave = true,
leaveReason = "ให้ออกจากราชการ", leaveReason = "ให้ออกจากราชการ",
dateLeave = r.commandAffectDate, dateLeave = r.commandAffectDate,
isGovernment = false isGovernment = false,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -2460,6 +2460,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
isGovernment = false, isGovernment = false,
leaveReason = "ออกจากราชการ", leaveReason = "ออกจากราชการ",
dateLeave = r.commandAffectDate, dateLeave = r.commandAffectDate,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -2645,6 +2647,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = false, isLeave = false,
leaveReason = _null, leaveReason = _null,
dateLeave = _null, dateLeave = _null,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -2403,6 +2403,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
isGovernment = false, isGovernment = false,
leaveReason = "ออกจากราชการ", leaveReason = "ออกจากราชการ",
dateLeave = r.commandAffectDate, dateLeave = r.commandAffectDate,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -2588,6 +2590,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = false, isLeave = false,
leaveReason = _null, leaveReason = _null,
dateLeave = _null, dateLeave = _null,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -19,5 +19,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public double? amountSpecial { get; set; } public double? amountSpecial { get; set; }
public double? positionSalaryAmount { get; set; } public double? positionSalaryAmount { get; set; }
public double? mouthSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; }
public string? refCommandCode { get; set; }
public string? refCommandName { get; set; }
} }
} }