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

migrate + add field PositionExecutiveOld

Browse source
This commit is contained in:
Bright 2025-03-21 14:31:45 +07:00
parent 71a1c48392
commit 1b6cc4f014
20 changed files with 20131 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BMA.EHR.Domain/Models/Placement/PlacementAppointment.cs
View file

@ -117,6 +117,8 @@ namespace BMA.EHR.Domain.Models.Placement
public int? posMasterNo { get; set; }
[Comment("ชื่อตำแหน่งในสายงาน")]
public string? position { get; set; }
[Comment("ตำแหน่งทางการบริหาร")]
public string? PositionExecutive { get; set; }
[Comment("id ประเภทตำแหน่ง")]
public string? posTypeId { get; set; }
[Comment("ชื่อประเภทตำแหน่ง")]
@ -164,6 +166,8 @@ namespace BMA.EHR.Domain.Models.Placement
public int? posMasterNoOld { get; set; }
[Comment("ชื่อตำแหน่งในสายงาน old")]
public string? positionOld { get; set; }
[Comment("ตำแหน่งทางการบริหารเดิม")]
public string? PositionExecutiveOld { get; set; }
[Comment("id ประเภทตำแหน่ง old")]
public string? posTypeOldId { get; set; }
[Comment("ชื่อประเภทตำแหน่ง old")]

2
BMA.EHR.Domain/Models/Placement/PlacementOfficer.cs
View file

@ -23,6 +23,8 @@ namespace BMA.EHR.Domain.Models.Placement
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ตำแหน่งทางการบริหารเดิม")]
public string? PositionExecutiveOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม เงินเดือน")]
public double? AmountOld { get; set; }
[Comment("สังกัด")]

2
BMA.EHR.Domain/Models/Placement/PlacementReceive.cs
View file

@ -47,6 +47,8 @@ namespace BMA.EHR.Domain.Models.Placement
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ตำแหน่งทางการบริหารเดิม")]
public string? PositionExecutiveOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท")]
public string? PositionTypeOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ระดับ")]

2
BMA.EHR.Domain/Models/Placement/PlacementRepatriation.cs
View file

@ -19,6 +19,8 @@ namespace BMA.EHR.Domain.Models.Placement
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ตำแหน่งทางการบริหารเดิม")]
public string? PositionExecutiveOld { get; set; }
[Comment("ตั้งแต่วันที่")]
public DateTime? Date { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท")]

2
BMA.EHR.Domain/Models/Placement/PlacementTransfer.cs
View file

@ -19,6 +19,8 @@ namespace BMA.EHR.Domain.Models.Placement
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ตำแหน่งทางการบริหารเดิม")]
public string? PositionExecutiveOld { get; set; }
[Comment("ตั้งแต่วันที่")]
public DateTime? Date { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท")]

2
BMA.EHR.Domain/Models/Retirement/RetirementDeceased.cs
View file

@ -81,6 +81,8 @@ namespace BMA.EHR.Domain.Models.Retirement
public int? posMasterNo { get; set; }
[Comment("ชื่อตำแหน่งในสายงาน")]
public string? position { get; set; }
[Comment("ตำแหน่งทางการบริหารเดิม")]
public string? PositionExecutiveOld { get; set; }
[Comment("id ประเภทตำแหน่ง")]
public string? posTypeId { get; set; }
[Comment("ชื่อประเภทตำแหน่ง")]

2
BMA.EHR.Domain/Models/Retirement/RetirementOther.cs
View file

@ -27,6 +27,8 @@ namespace BMA.EHR.Domain.Models.Retirement
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ตำแหน่งทางการบริหารเดิม")]
public string? PositionExecutiveOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท")]
public string? PositionTypeOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ระดับ")]

2
BMA.EHR.Domain/Models/Retirement/RetirementOut.cs
View file

@ -19,6 +19,8 @@ namespace BMA.EHR.Domain.Models.Retirement
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ตำแหน่งทางการบริหารเดิม")]
public string? PositionExecutiveOld { get; set; }
[Comment("ตั้งแต่วันที่")]
public DateTime? Date { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท")]

19916
BMA.EHR.Infrastructure/Migrations/20250321061705_addPositionExecutiveOld.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

126
BMA.EHR.Infrastructure/Migrations/20250321061705_addPositionExecutiveOld.cs Normal file
View file

@ -0,0 +1,126 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class addPositionExecutiveOld : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveOld",
table: "RetirementOuts",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหารเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveOld",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหารเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveOld",
table: "RetirementDeceaseds",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหารเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveOld",
table: "PlacementTransfers",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหารเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveOld",
table: "PlacementRepatriations",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหารเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหารเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveOld",
table: "PlacementOfficers",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหารเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutive",
table: "PlacementAppointments",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหาร")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveOld",
table: "PlacementAppointments",
type: "longtext",
nullable: true,
comment: "ตำแหน่งทางการบริหารเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PositionExecutiveOld",
table: "RetirementOuts");
migrationBuilder.DropColumn(
name: "PositionExecutiveOld",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionExecutiveOld",
table: "RetirementDeceaseds");
migrationBuilder.DropColumn(
name: "PositionExecutiveOld",
table: "PlacementTransfers");
migrationBuilder.DropColumn(
name: "PositionExecutiveOld",
table: "PlacementRepatriations");
migrationBuilder.DropColumn(
name: "PositionExecutiveOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "PositionExecutiveOld",
table: "PlacementOfficers");
migrationBuilder.DropColumn(
name: "PositionExecutive",
table: "PlacementAppointments");
migrationBuilder.DropColumn(
name: "PositionExecutiveOld",
table: "PlacementAppointments");
}
}
}

36
BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs
View file

@ -11441,6 +11441,14 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("datetime(6)")
.HasComment("ดำรงตำแหน่งในระดับปัจจุบันเมื่อ");
b.Property<string>("PositionExecutive")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหาร");
b.Property<string>("PositionExecutiveOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหารเดิม");
b.Property<string>("PositionLevelOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ระดับ");
@ -12227,6 +12235,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("สังกัด");
b.Property<string>("PositionExecutiveOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหารเดิม");
b.Property<string>("PositionLevelOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ระดับ");
@ -13243,6 +13255,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
b.Property<string>("PositionExecutiveOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหารเดิม");
b.Property<string>("PositionLevelOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ระดับ");
@ -13922,6 +13938,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("สังกัด");
b.Property<string>("PositionExecutiveOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหารเดิม");
b.Property<string>("PositionLevelOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ระดับ");
@ -14143,6 +14163,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("สังกัด");
b.Property<string>("PositionExecutiveOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหารเดิม");
b.Property<string>("PositionLevelOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ระดับ");
@ -14573,6 +14597,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("เลขที่ใบมรณบัตร");
b.Property<string>("PositionExecutiveOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหารเดิม");
b.Property<string>("Reason")
.HasColumnType("longtext")
.HasComment("เหตุผลการเสียชีวิต");
@ -15108,6 +15136,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("datetime(6)")
.HasComment("ดำรงตำแหน่งในระดับปัจจุบันเมื่อ");
b.Property<string>("PositionExecutiveOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหารเดิม");
b.Property<string>("PositionLevelOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ระดับ");
@ -15397,6 +15429,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("สังกัด");
b.Property<string>("PositionExecutiveOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งทางการบริหารเดิม");
b.Property<string>("PositionLevelOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ระดับ");

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

@ -117,6 +117,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.positionId,
p.posMasterNo,
p.position,
p.PositionExecutive,
p.positionField,
p.posTypeId,
p.posTypeName,
@ -165,6 +166,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.OrganizationOld,
p.posmasterId,
p.positionOld,
p.PositionExecutiveOld,
p.CreatedAt,
p.typeCommand,
})
@ -226,6 +228,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.positionId,
p.posMasterNo,
p.position,
p.PositionExecutive,
p.positionField,
p.posTypeId,
p.posTypeName,
@ -269,6 +272,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.AmountOld,
p.OrganizationOld,
p.positionOld,
p.PositionExecutiveOld,
p.typeCommand,
p.posmasterId,
})
@ -362,7 +366,7 @@ namespace BMA.EHR.Placement.Service.Controllers
}
/// <summary>
/// สร้างแต่งตั้ง-เลื่อน
/// สร้างแต่งตั้ง-เลื่อน-ย้าย
/// </summary>
/// <returns></returns>
/// <response code="200"></response>
@ -448,6 +452,7 @@ namespace BMA.EHR.Placement.Service.Controllers
// placementAppointment.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount;
placementAppointment.positionOld = org.result.position;
placementAppointment.PositionExecutiveOld = org.result.posExecutiveName;
placementAppointment.PositionLevelOld = org.result.posLevelName;
placementAppointment.PositionTypeOld = org.result.posTypeName;
placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;

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

@ -112,6 +112,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4OldId,
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -183,6 +184,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4OldId,
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -240,6 +242,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4OldId,
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -319,6 +322,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.Organization,
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.OrganizationOld,
p.IsActive,
})
@ -398,6 +402,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementOfficer.posLevelNameOld = org.result.posLevelName;
placementOfficer.PositionOld = org.result.position;
placementOfficer.PositionExecutiveOld = org.result.posExecutiveName;
placementOfficer.PositionLevelOld = org.result.posLevelName;
placementOfficer.PositionTypeOld = org.result.posTypeName;
placementOfficer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;

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

@ -156,6 +156,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4ShortNameOld,
p.posMasterNoOld,
p.PositionOld,
p.PositionExecutiveOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
@ -242,6 +243,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.EducationOld,
p.AmountOld,
p.PositionOld,
p.PositionExecutiveOld,
p.OrganizationOld,
p.PositionTypeOld,
p.PositionLevelOld,
@ -340,6 +342,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.EducationOld,
data.AmountOld,
data.PositionOld,
data.PositionExecutiveOld,
organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld,
data.PositionTypeOld,
data.PositionLevelOld,
@ -494,6 +497,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.AmountOld = org.result.Amount;
placementReceive.PositionOld = org.result.position;
placementReceive.PositionExecutiveOld = org.result.posExecutiveName;
placementReceive.PositionLevelOld = org.result.posLevelName;
placementReceive.PositionTypeOld = org.result.posTypeName;
placementReceive.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;

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

@ -113,6 +113,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4OldId,
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -199,6 +200,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.DateRepatriation,
})
.FirstOrDefaultAsync();
@ -277,6 +279,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementRepatriation.posLevelNameOld = org.result.posLevelName;
placementRepatriation.PositionOld = org.result.position;
placementRepatriation.PositionExecutiveOld = org.result.posExecutiveName;
placementRepatriation.PositionLevelOld = org.result.posLevelName;
placementRepatriation.PositionTypeOld = org.result.posTypeName;
placementRepatriation.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;

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

@ -206,6 +206,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4OldId,
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -281,6 +282,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
.FirstOrDefaultAsync();
@ -335,6 +337,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.PositionNumberOld,
data.OrganizationPositionOld,
data.PositionOld,
data.PositionExecutiveOld,
Docs = placementTransferDocs,
};
@ -403,6 +406,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
.FirstOrDefaultAsync();
@ -457,6 +461,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.PositionNumberOld,
data.OrganizationPositionOld,
data.PositionOld,
data.PositionExecutiveOld,
Docs = placementTransferDocs,
};
@ -532,6 +537,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementTransfer.posLevelNameOld = org.result.posLevelName;
placementTransfer.AmountOld = org.result.salary;
placementTransfer.PositionOld = org.result.position;
placementTransfer.PositionExecutiveOld = org.result.posExecutiveName;
placementTransfer.PositionLevelOld = org.result.posLevelName;
placementTransfer.PositionTypeOld = org.result.posTypeName;
placementTransfer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;

1
BMA.EHR.Placement.Service/Requests/OrgRequest.cs
View file

@ -41,6 +41,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? nodeShortName { get; set; }
public int? posMasterNo { get; set; }
public string? position { get; set; }
public string? posExecutiveName { get; set; }
public string? posTypeId { get; set; }
public string? posTypeName { get; set; }
public string? posLevelId { get; set; }

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

@ -114,6 +114,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.child4ShortName,
p.posMasterNo,
p.position,
p.PositionExecutiveOld,
p.posLevelName,
p.posTypeName,
p.CreatedAt,
@ -157,6 +158,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.child4ShortName,
p.posMasterNo,
p.position,
p.PositionExecutiveOld,
p.posLevelName,
p.posTypeName,
p.Number,
@ -191,6 +193,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.child4ShortName,
data.posMasterNo,
data.position,
data.PositionExecutiveOld,
data.posLevelName,
data.posTypeName,
data.Number,
@ -285,6 +288,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementDeceased.child4ShortName = org.result.child4ShortName;
retirementDeceased.posMasterNo = org.result.posMasterNo;
retirementDeceased.position = org.result.position;
retirementDeceased.PositionExecutiveOld = org.result.posExecutiveName;
retirementDeceased.posTypeId = org.result.posTypeId;
retirementDeceased.posTypeName = $"{org.result.posTypeShortName} {org.result.posTypeName}";
retirementDeceased.posLevelId = org.result.posLevelId;

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

@ -128,6 +128,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.child4OldId,
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -234,6 +235,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.OrganizationOld,
p.PositionDate,
CommandType = p.CommandType == null ? null : p.CommandType.Name,
@ -319,6 +321,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.LeaveDate = org.result.leaveDate;
retirementOther.PositionOld = org.result.position;
retirementOther.PositionExecutiveOld = org.result.posExecutiveName;
retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName;
retirementOther.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;

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

@ -130,6 +130,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.child4OldId,
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -217,6 +218,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.OrganizationOld,
})
.FirstOrDefaultAsync();
@ -296,6 +298,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOut.posLevelNameOld = org.result.posLevelName;
retirementOut.PositionOld = org.result.position;
retirementOut.PositionExecutiveOld = org.result.posExecutiveName;
retirementOut.PositionLevelOld = org.result.posLevelName;
retirementOut.PositionTypeOld = org.result.posTypeName;
retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;