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

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

@ -919,6 +919,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc,
posmasterId = p.posmasterId,
positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1132,6 +1134,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc,
posmasterId = p.posmasterId,
positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1333,6 +1337,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc,
posmasterId = p.posmasterId,
positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1539,6 +1545,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc,
posmasterId = p.posmasterId,
positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1764,6 +1772,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc,
posmasterId = p.posmasterId,
positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
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,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isGovernment = true
isGovernment = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
},
bodyPosition = new
{
@ -2040,7 +2042,9 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
isGovernment = true
isGovernment = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
},
bodyPosition = new
{
@ -2285,6 +2289,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc,
posmasterId = p.posmasterId,
positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -2514,6 +2520,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc,
posmasterId = p.posmasterId,
positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -2732,6 +2740,8 @@ namespace BMA.EHR.Placement.Service.Controllers
templateDoc = r.templateDoc,
posmasterId = p.posmasterId,
positionId = p.positionId,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
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);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,
@ -685,6 +686,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.PositionLevelOld,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
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,
positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc
templateDoc = r.templateDoc,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
},
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,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
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);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,
@ -903,6 +904,8 @@ namespace BMA.EHR.Placement.Service.Controllers
leaveReason = "โอนออก",
dateLeave = r.commandAffectDate,
isLeave = true,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
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? positionSalaryAmount { get; set; }
public double? mouthSalaryAmount { get; set; }
public string? refCommandCode { get; set; }
public string? refCommandName { get; set; }
}
}