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 2024-05-09 12:53:07 +07:00
parent db712d586a
commit 083d48c24c
10 changed files with 17786 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.Status,
p.Amount,
p.RecruitDate,
// p.RecruitDate,
p.ReportingDate,
p.IsActive,
@ -228,7 +228,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.Status,
p.Amount,
p.RecruitDate,
p.ReportingDate,
p.CreatedAt,
p.Reason,
@ -244,6 +244,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionOld,
// PlacementAppointmentDocs = p.PlacementAppointmentDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
p.typeCommand,
p.posmasterId,
})
.FirstOrDefaultAsync();
if (data == null)
@ -322,7 +323,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.Status,
data.Amount,
data.RecruitDate,
data.ReportingDate,
data.CreatedAt,
data.Reason,
@ -338,6 +339,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.PositionOld,
// Docs = placementAppointmentDocs,
data.typeCommand,
data.posmasterId,
};
return Success(_data);

8
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
View file

@ -131,7 +131,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.Status,
p.Amount,
p.RecruitDate,
// p.RecruitDate,
p.ReportingDate,
p.IsActive,
@ -226,7 +226,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.Status,
p.Amount,
p.RecruitDate,
p.ReportingDate,
p.CreatedAt,
p.Reason,
@ -320,7 +320,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.Status,
data.Amount,
data.RecruitDate,
data.ReportingDate,
data.CreatedAt,
data.Reason,
@ -536,7 +536,7 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.posLevelId = req.posLevelId;
uppdated.posLevelName = req.posLevelName;
uppdated.Amount = req.Amount;
uppdated.RecruitDate = req.RecruitDate;
// uppdated.RecruitDate = req.RecruitDate;
uppdated.ReportingDate = req.reportingDate;
uppdated.Status = "PENDING";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";

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

@ -100,8 +100,9 @@ namespace BMA.EHR.Placement.Service.Controllers
p.firstName,
p.lastName,
p.citizenId,
p.DateOfBirth,
p.Status,
p.RecruitDate,
p.ReportingDate,
p.root,
p.rootId,
p.rootShortName,
@ -126,6 +127,11 @@ namespace BMA.EHR.Placement.Service.Controllers
p.posTypeName,
p.posLevelId,
p.posLevelName,
p.posmasterId,
node = p.root == null ? (int?)null : (p.child1 == null ? 0 : (p.child2 == null ? 1 : (p.child3 == null ? 2 : (p.child4 == null ? 3 : 4)))),
nodeName = p.root == null ? null : (p.child1 == null ? p.root : (p.child2 == null ? p.child1 : (p.child3 == null ? p.child2 : (p.child4 == null ? p.child3 : p.child4)))),
nodeId = p.rootId == null ? null : (p.child1Id == null ? p.rootId : (p.child2Id == null ? p.child1Id : (p.child3Id == null ? p.child2Id : (p.child4Id == null ? p.child3Id : p.child4Id)))),
nodeShortName = p.rootShortName == null ? null : (p.child1ShortName == null ? p.rootShortName : (p.child2ShortName == null ? p.child1ShortName : (p.child3ShortName == null ? p.child2ShortName : (p.child4ShortName == null ? p.child3ShortName : p.child4ShortName)))),
p.IsActive,
p.Reason,
@ -153,7 +159,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4OldId,
p.child4ShortNameOld,
p.posMasterNoOld,
p.positionOld,
p.PositionOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
@ -200,7 +206,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.TelephoneNumber,
p.Status,
p.Amount,
p.RecruitDate,
p.ReportingDate,
p.root,
p.rootId,
p.rootShortName,
@ -294,7 +300,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.TelephoneNumber,
data.Status,
data.Amount,
data.RecruitDate,
data.ReportingDate,
data.root,
data.rootId,
data.rootShortName,
@ -412,10 +418,10 @@ namespace BMA.EHR.Placement.Service.Controllers
if (org != null && org.result != null)
{
placementReceive.profileId = org.result.profileId;
placementReceive.prefix = org.result.prefix;
placementReceive.firstName = org.result.firstName;
placementReceive.lastName = org.result.lastName;
placementReceive.citizenId = org.result.citizenId;
// placementReceive.prefix = org.result.prefix;
// placementReceive.firstName = org.result.firstName;
// placementReceive.lastName = org.result.lastName;
// placementReceive.citizenId = org.result.citizenId;
placementReceive.rootOld = org.result.root;
placementReceive.rootOldId = org.result.rootId;
placementReceive.rootShortNameOld = org.result.rootShortName;
@ -448,7 +454,7 @@ namespace BMA.EHR.Placement.Service.Controllers
(org.result.child3 == null ? "" : org.result.child3 + "/") +
(org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root + "/");
(org.result.root == null ? "" : org.result.root);
placementReceive.OrganizationPositionOld = org.result.position + "-" + placementReceive.OrganizationOld;
}
}
@ -598,7 +604,7 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.posLevelId = req.posLevelId;
uppdated.posLevelName = req.posLevelName;
uppdated.Amount = req.Amount;
uppdated.RecruitDate = req.RecruitDate;
uppdated.ReportingDate = req.reportingDate;
uppdated.Status = "PENDING";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
uppdated.LastUpdateUserId = UserId ?? "";