แก้วินัยผูก profile ใหม่
This commit is contained in:
Kittapath
parent
afe16503ee
commit
b7f19d7077
36 changed files with 40179 additions and 978 deletions
|
|
@ -92,7 +92,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
|
||||
var retirementOthers = await _context.RetirementOthers.AsQueryable()
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
||||
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
|
|
@ -100,20 +100,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.Status,
|
||||
p.CreatedAt,
|
||||
p.Reason,
|
||||
|
|
@ -154,20 +161,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.Status,
|
||||
p.CreatedAt,
|
||||
p.Reason,
|
||||
|
|
@ -309,27 +322,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementOther.firstName = org.result.firstName;
|
||||
retirementOther.lastName = org.result.lastName;
|
||||
retirementOther.citizenId = org.result.citizenId;
|
||||
retirementOther.root = org.result.root;
|
||||
retirementOther.rootId = org.result.rootId;
|
||||
retirementOther.rootShortName = org.result.rootShortName;
|
||||
retirementOther.child1 = org.result.child1;
|
||||
retirementOther.child1Id = org.result.child1Id;
|
||||
retirementOther.child1ShortName = org.result.child1ShortName;
|
||||
retirementOther.child2 = org.result.child2;
|
||||
retirementOther.child2Id = org.result.child2Id;
|
||||
retirementOther.child2ShortName = org.result.child2ShortName;
|
||||
retirementOther.child3 = org.result.child3;
|
||||
retirementOther.child3Id = org.result.child3Id;
|
||||
retirementOther.child3ShortName = org.result.child3ShortName;
|
||||
retirementOther.child4 = org.result.child4;
|
||||
retirementOther.child4Id = org.result.child4Id;
|
||||
retirementOther.child4ShortName = org.result.child4ShortName;
|
||||
retirementOther.posMasterNo = org.result.posMasterNo;
|
||||
retirementOther.position = org.result.position;
|
||||
retirementOther.posTypeId = org.result.posTypeId;
|
||||
retirementOther.posTypeName = org.result.posTypeName;
|
||||
retirementOther.posLevelId = org.result.posLevelId;
|
||||
retirementOther.posLevelName = org.result.posLevelName;
|
||||
retirementOther.rootOld = org.result.root;
|
||||
retirementOther.rootOldId = org.result.rootId;
|
||||
retirementOther.rootShortNameOld = org.result.rootShortName;
|
||||
retirementOther.child1Old = org.result.child1;
|
||||
retirementOther.child1OldId = org.result.child1Id;
|
||||
retirementOther.child1ShortNameOld = org.result.child1ShortName;
|
||||
retirementOther.child2Old = org.result.child2;
|
||||
retirementOther.child2OldId = org.result.child2Id;
|
||||
retirementOther.child2ShortNameOld = org.result.child2ShortName;
|
||||
retirementOther.child3Old = org.result.child3;
|
||||
retirementOther.child3OldId = org.result.child3Id;
|
||||
retirementOther.child3ShortNameOld = org.result.child3ShortName;
|
||||
retirementOther.child4Old = org.result.child4;
|
||||
retirementOther.child4OldId = org.result.child4Id;
|
||||
retirementOther.child4ShortNameOld = org.result.child4ShortName;
|
||||
retirementOther.posMasterNoOld = org.result.posMasterNo;
|
||||
retirementOther.posTypeOldId = org.result.posTypeId;
|
||||
retirementOther.posTypeNameOld = org.result.posTypeName;
|
||||
retirementOther.posLevelOldId = org.result.posLevelId;
|
||||
retirementOther.posLevelNameOld = org.result.posLevelName;
|
||||
|
||||
retirementOther.PositionOld = org.result.position;
|
||||
retirementOther.PositionLevelOld = org.result.posLevelName;
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
|
||||
var retirementOuts = await _context.RetirementOuts.AsQueryable()
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
||||
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
|
|
@ -100,20 +100,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.CreatedAt,
|
||||
p.Organization,
|
||||
p.Reason,
|
||||
|
|
@ -153,20 +160,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Organization,
|
||||
|
|
@ -270,27 +283,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementOut.firstName = org.result.firstName;
|
||||
retirementOut.lastName = org.result.lastName;
|
||||
retirementOut.citizenId = org.result.citizenId;
|
||||
retirementOut.root = org.result.root;
|
||||
retirementOut.rootId = org.result.rootId;
|
||||
retirementOut.rootShortName = org.result.rootShortName;
|
||||
retirementOut.child1 = org.result.child1;
|
||||
retirementOut.child1Id = org.result.child1Id;
|
||||
retirementOut.child1ShortName = org.result.child1ShortName;
|
||||
retirementOut.child2 = org.result.child2;
|
||||
retirementOut.child2Id = org.result.child2Id;
|
||||
retirementOut.child2ShortName = org.result.child2ShortName;
|
||||
retirementOut.child3 = org.result.child3;
|
||||
retirementOut.child3Id = org.result.child3Id;
|
||||
retirementOut.child3ShortName = org.result.child3ShortName;
|
||||
retirementOut.child4 = org.result.child4;
|
||||
retirementOut.child4Id = org.result.child4Id;
|
||||
retirementOut.child4ShortName = org.result.child4ShortName;
|
||||
retirementOut.posMasterNo = org.result.posMasterNo;
|
||||
retirementOut.position = org.result.position;
|
||||
retirementOut.posTypeId = org.result.posTypeId;
|
||||
retirementOut.posTypeName = org.result.posTypeName;
|
||||
retirementOut.posLevelId = org.result.posLevelId;
|
||||
retirementOut.posLevelName = org.result.posLevelName;
|
||||
retirementOut.rootOld = org.result.root;
|
||||
retirementOut.rootOldId = org.result.rootId;
|
||||
retirementOut.rootShortNameOld = org.result.rootShortName;
|
||||
retirementOut.child1Old = org.result.child1;
|
||||
retirementOut.child1OldId = org.result.child1Id;
|
||||
retirementOut.child1ShortNameOld = org.result.child1ShortName;
|
||||
retirementOut.child2Old = org.result.child2;
|
||||
retirementOut.child2OldId = org.result.child2Id;
|
||||
retirementOut.child2ShortNameOld = org.result.child2ShortName;
|
||||
retirementOut.child3Old = org.result.child3;
|
||||
retirementOut.child3OldId = org.result.child3Id;
|
||||
retirementOut.child3ShortNameOld = org.result.child3ShortName;
|
||||
retirementOut.child4Old = org.result.child4;
|
||||
retirementOut.child4OldId = org.result.child4Id;
|
||||
retirementOut.child4ShortNameOld = org.result.child4ShortName;
|
||||
retirementOut.posMasterNoOld = org.result.posMasterNo;
|
||||
retirementOut.posTypeOldId = org.result.posTypeId;
|
||||
retirementOut.posTypeNameOld = org.result.posTypeName;
|
||||
retirementOut.posLevelOldId = org.result.posLevelId;
|
||||
retirementOut.posLevelNameOld = org.result.posLevelName;
|
||||
|
||||
retirementOut.PositionOld = org.result.position;
|
||||
retirementOut.PositionLevelOld = org.result.posLevelName;
|
||||
|
|
|
|||
|
|
@ -247,10 +247,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.OfficerRejectReason,
|
||||
p.OfficerRejectDate,
|
||||
p.RemarkHorizontal,
|
||||
p.position,
|
||||
p.posTypeName,
|
||||
p.posLevelName,
|
||||
p.posMasterNo,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
|
||||
RetirementResignDocs = p.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
// RetirementResignDebtDocs = p.RetirementResignDebtDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
|
|
@ -316,10 +333,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
data.OfficerRejectReason,
|
||||
data.OfficerRejectDate,
|
||||
data.RemarkHorizontal,
|
||||
data.position,
|
||||
data.posTypeName,
|
||||
data.posLevelName,
|
||||
data.posMasterNo,
|
||||
data.rootOld,
|
||||
data.rootOldId,
|
||||
data.rootShortNameOld,
|
||||
data.child1Old,
|
||||
data.child1OldId,
|
||||
data.child1ShortNameOld,
|
||||
data.child2Old,
|
||||
data.child2OldId,
|
||||
data.child2ShortNameOld,
|
||||
data.child3Old,
|
||||
data.child3OldId,
|
||||
data.child3ShortNameOld,
|
||||
data.child4Old,
|
||||
data.child4OldId,
|
||||
data.child4ShortNameOld,
|
||||
data.PositionOld,
|
||||
data.posMasterNoOld,
|
||||
data.posTypeOldId,
|
||||
data.posTypeNameOld,
|
||||
data.posLevelOldId,
|
||||
data.posLevelNameOld,
|
||||
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
||||
Docs = retirementResignDocs,
|
||||
// DocDebts = retirementResignDebtDocs,
|
||||
|
|
@ -390,27 +424,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementResign.firstName = org.result.firstName;
|
||||
retirementResign.lastName = org.result.lastName;
|
||||
retirementResign.citizenId = org.result.citizenId;
|
||||
retirementResign.root = org.result.root;
|
||||
retirementResign.rootId = org.result.rootId;
|
||||
retirementResign.rootShortName = org.result.rootShortName;
|
||||
retirementResign.child1 = org.result.child1;
|
||||
retirementResign.child1Id = org.result.child1Id;
|
||||
retirementResign.child1ShortName = org.result.child1ShortName;
|
||||
retirementResign.child2 = org.result.child2;
|
||||
retirementResign.child2Id = org.result.child2Id;
|
||||
retirementResign.child2ShortName = org.result.child2ShortName;
|
||||
retirementResign.child3 = org.result.child3;
|
||||
retirementResign.child3Id = org.result.child3Id;
|
||||
retirementResign.child3ShortName = org.result.child3ShortName;
|
||||
retirementResign.child4 = org.result.child4;
|
||||
retirementResign.child4Id = org.result.child4Id;
|
||||
retirementResign.child4ShortName = org.result.child4ShortName;
|
||||
retirementResign.posMasterNo = org.result.posMasterNo;
|
||||
retirementResign.position = org.result.position;
|
||||
retirementResign.posTypeId = org.result.posTypeId;
|
||||
retirementResign.posTypeName = org.result.posTypeName;
|
||||
retirementResign.posLevelId = org.result.posLevelId;
|
||||
retirementResign.posLevelName = org.result.posLevelName;
|
||||
retirementResign.rootOld = org.result.root;
|
||||
retirementResign.rootOldId = org.result.rootId;
|
||||
retirementResign.rootShortNameOld = org.result.rootShortName;
|
||||
retirementResign.child1Old = org.result.child1;
|
||||
retirementResign.child1OldId = org.result.child1Id;
|
||||
retirementResign.child1ShortNameOld = org.result.child1ShortName;
|
||||
retirementResign.child2Old = org.result.child2;
|
||||
retirementResign.child2OldId = org.result.child2Id;
|
||||
retirementResign.child2ShortNameOld = org.result.child2ShortName;
|
||||
retirementResign.child3Old = org.result.child3;
|
||||
retirementResign.child3OldId = org.result.child3Id;
|
||||
retirementResign.child3ShortNameOld = org.result.child3ShortName;
|
||||
retirementResign.child4Old = org.result.child4;
|
||||
retirementResign.child4OldId = org.result.child4Id;
|
||||
retirementResign.child4ShortNameOld = org.result.child4ShortName;
|
||||
retirementResign.posMasterNoOld = org.result.posMasterNo;
|
||||
retirementResign.posTypeOldId = org.result.posTypeId;
|
||||
retirementResign.posTypeNameOld = org.result.posTypeName;
|
||||
retirementResign.posLevelOldId = org.result.posLevelId;
|
||||
retirementResign.posLevelNameOld = org.result.posLevelName;
|
||||
|
||||
retirementResign.PositionOld = org.result.position;
|
||||
retirementResign.PositionLevelOld = org.result.posLevelName;
|
||||
|
|
@ -1007,8 +1040,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
Id = p.Id,
|
||||
Prefix = p.RetirementResign.prefix,
|
||||
Position = p.RetirementResign.position,
|
||||
PositionLevel = p.RetirementResign.posLevelName,
|
||||
FirstName = p.RetirementResign.firstName,
|
||||
LastName = p.RetirementResign.lastName,
|
||||
Position = p.RetirementResign.PositionOld,
|
||||
PositionLevel = p.RetirementResign.posLevelNameOld,
|
||||
Org = p.RetirementResign.OrganizationOld,
|
||||
Fullname = $"{p.RetirementResign.prefix}{p.RetirementResign.firstName} {p.RetirementResign.lastName}",
|
||||
// Avatar = p.RetirementResign.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.RetirementResign.Profile.Avatar.Id,
|
||||
|
|
@ -1032,11 +1067,19 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
LastUpdatedAt = p.LastUpdatedAt,
|
||||
OrganizationPositionOld = p.RetirementResign.OrganizationPositionOld,
|
||||
CreatedAt = p.CreatedAt,
|
||||
position = p.RetirementResign.position,
|
||||
posTypeName = p.RetirementResign.posTypeName,
|
||||
posLevelName = p.RetirementResign.posLevelName,
|
||||
posMasterNo = p.RetirementResign.posMasterNo,
|
||||
|
||||
posTypeName = p.RetirementResign.posTypeNameOld,
|
||||
posLevelName = p.RetirementResign.posLevelNameOld,
|
||||
posMasterNo = p.RetirementResign.posMasterNoOld,
|
||||
root = p.RetirementResign.rootOld,
|
||||
rootShortName = p.RetirementResign.rootShortNameOld,
|
||||
child1 = p.RetirementResign.child1Old,
|
||||
child1ShortName = p.RetirementResign.child1ShortNameOld,
|
||||
child2 = p.RetirementResign.child2Old,
|
||||
child2ShortName = p.RetirementResign.child2ShortNameOld,
|
||||
child3 = p.RetirementResign.child3Old,
|
||||
child3ShortName = p.RetirementResign.child3ShortNameOld,
|
||||
child4 = p.RetirementResign.child4Old,
|
||||
child4ShortName = p.RetirementResign.child4ShortNameOld,
|
||||
Score1 = p.Score1,
|
||||
Score2 = p.Score2,
|
||||
Score3 = p.Score3,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue