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 2023-08-16 15:14:29 +07:00
parent acd4bed59f
commit 8f109d0863
12 changed files with 15854 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

14769
BMA.EHR.Infrastructure/Migrations/20230816040108_update table RetirementOther add Citizen1.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

663
BMA.EHR.Infrastructure/Migrations/20230816040108_update table RetirementOther add Citizen1.cs Normal file
View file

@ -0,0 +1,663 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetableRetirementOtheraddCitizen1 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_Profiles_ProfileId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "Date",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "Organization",
table: "RetirementOthers");
migrationBuilder.RenameColumn(
name: "ProfileId",
table: "RetirementOthers",
newName: "PrefixId");
migrationBuilder.RenameIndex(
name: "IX_RetirementOthers_ProfileId",
table: "RetirementOthers",
newName: "IX_RetirementOthers_PrefixId");
migrationBuilder.AlterColumn<string>(
name: "Reason",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "เหตุผลที่รับย้ายราชการ",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "เหตุผล")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "OrganizationPositionOld",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "สังกัดเดิม",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "สังกัด")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<double>(
name: "Amount",
table: "RetirementOthers",
type: "double",
nullable: true,
comment: "เงินเดือน");
migrationBuilder.AddColumn<Guid>(
name: "BloodGroupId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<string>(
name: "CitizenId",
table: "RetirementOthers",
type: "varchar(20)",
maxLength: 20,
nullable: false,
defaultValue: "",
comment: "เลขประจำตัวประชาชน")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<DateTime>(
name: "DateOfBirth",
table: "RetirementOthers",
type: "datetime(6)",
maxLength: 40,
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
comment: "วันเกิด");
migrationBuilder.AddColumn<string>(
name: "EducationOld",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "วุฒิ/สาขาเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "Firstname",
table: "RetirementOthers",
type: "longtext",
nullable: false,
comment: "ชื่อ")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<Guid>(
name: "GenderId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<string>(
name: "Lastname",
table: "RetirementOthers",
type: "longtext",
nullable: false,
comment: "นามสกุล")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "Nationality",
table: "RetirementOthers",
type: "varchar(100)",
maxLength: 100,
nullable: true,
comment: "สัญชาติ")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<Guid>(
name: "OrganizationPositionId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<DateTime>(
name: "PositionDate",
table: "RetirementOthers",
type: "datetime(6)",
nullable: true,
comment: "ดำรงตำแหน่งในระดับปัจจุบันเมื่อ");
migrationBuilder.AddColumn<Guid>(
name: "PositionLevelId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "PositionLineId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "PositionNumberId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "PositionPathId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "PositionPathSideId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "PositionTypeId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<string>(
name: "Race",
table: "RetirementOthers",
type: "varchar(100)",
maxLength: 100,
nullable: true,
comment: "เชื้อชาติ")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<DateTime>(
name: "RecruitDate",
table: "RetirementOthers",
type: "datetime(6)",
nullable: true,
comment: "วันที่บรรจุ");
migrationBuilder.AddColumn<Guid>(
name: "RelationshipId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "ReligionId",
table: "RetirementOthers",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<string>(
name: "TelephoneNumber",
table: "RetirementOthers",
type: "varchar(50)",
maxLength: 50,
nullable: true,
comment: "เบอร์โทร")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "RetirementOtherDocs",
columns: table => new
{
Id = table.Column<Guid>(type: "char(36)", nullable: false, comment: "PrimaryKey", collation: "ascii_general_ci"),
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "สร้างข้อมูลเมื่อ"),
CreatedUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่สร้างข้อมูล")
.Annotation("MySql:CharSet", "utf8mb4"),
LastUpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "แก้ไขข้อมูลล่าสุดเมื่อ"),
LastUpdateUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่แก้ไขข้อมูลล่าสุด")
.Annotation("MySql:CharSet", "utf8mb4"),
CreatedFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่สร้างข้อมูล")
.Annotation("MySql:CharSet", "utf8mb4"),
LastUpdateFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่แก้ไขข้อมูลล่าสุด")
.Annotation("MySql:CharSet", "utf8mb4"),
DocumentId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
RetirementOtherId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
},
constraints: table =>
{
table.PrimaryKey("PK_RetirementOtherDocs", x => x.Id);
table.ForeignKey(
name: "FK_RetirementOtherDocs_Documents_DocumentId",
column: x => x.DocumentId,
principalTable: "Documents",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_RetirementOtherDocs_RetirementOthers_RetirementOtherId",
column: x => x.RetirementOtherId,
principalTable: "RetirementOthers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_BloodGroupId",
table: "RetirementOthers",
column: "BloodGroupId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_GenderId",
table: "RetirementOthers",
column: "GenderId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_OrganizationPositionId",
table: "RetirementOthers",
column: "OrganizationPositionId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_PositionLevelId",
table: "RetirementOthers",
column: "PositionLevelId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_PositionLineId",
table: "RetirementOthers",
column: "PositionLineId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_PositionNumberId",
table: "RetirementOthers",
column: "PositionNumberId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_PositionPathId",
table: "RetirementOthers",
column: "PositionPathId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_PositionPathSideId",
table: "RetirementOthers",
column: "PositionPathSideId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_PositionTypeId",
table: "RetirementOthers",
column: "PositionTypeId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_RelationshipId",
table: "RetirementOthers",
column: "RelationshipId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOthers_ReligionId",
table: "RetirementOthers",
column: "ReligionId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOtherDocs_DocumentId",
table: "RetirementOtherDocs",
column: "DocumentId");
migrationBuilder.CreateIndex(
name: "IX_RetirementOtherDocs_RetirementOtherId",
table: "RetirementOtherDocs",
column: "RetirementOtherId");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_BloodGroups_BloodGroupId",
table: "RetirementOthers",
column: "BloodGroupId",
principalTable: "BloodGroups",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_Genders_GenderId",
table: "RetirementOthers",
column: "GenderId",
principalTable: "Genders",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_OrganizationPositions_OrganizationPositionId",
table: "RetirementOthers",
column: "OrganizationPositionId",
principalTable: "OrganizationPositions",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_PositionLevels_PositionLevelId",
table: "RetirementOthers",
column: "PositionLevelId",
principalTable: "PositionLevels",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_PositionLines_PositionLineId",
table: "RetirementOthers",
column: "PositionLineId",
principalTable: "PositionLines",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_PositionNumbers_PositionNumberId",
table: "RetirementOthers",
column: "PositionNumberId",
principalTable: "PositionNumbers",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_PositionPathSides_PositionPathSideId",
table: "RetirementOthers",
column: "PositionPathSideId",
principalTable: "PositionPathSides",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_PositionPaths_PositionPathId",
table: "RetirementOthers",
column: "PositionPathId",
principalTable: "PositionPaths",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_PositionTypes_PositionTypeId",
table: "RetirementOthers",
column: "PositionTypeId",
principalTable: "PositionTypes",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_Prefixes_PrefixId",
table: "RetirementOthers",
column: "PrefixId",
principalTable: "Prefixes",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_Relationships_RelationshipId",
table: "RetirementOthers",
column: "RelationshipId",
principalTable: "Relationships",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_Religions_ReligionId",
table: "RetirementOthers",
column: "ReligionId",
principalTable: "Religions",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_BloodGroups_BloodGroupId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_Genders_GenderId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_OrganizationPositions_OrganizationPositionId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_PositionLevels_PositionLevelId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_PositionLines_PositionLineId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_PositionNumbers_PositionNumberId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_PositionPathSides_PositionPathSideId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_PositionPaths_PositionPathId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_PositionTypes_PositionTypeId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_Prefixes_PrefixId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_Relationships_RelationshipId",
table: "RetirementOthers");
migrationBuilder.DropForeignKey(
name: "FK_RetirementOthers_Religions_ReligionId",
table: "RetirementOthers");
migrationBuilder.DropTable(
name: "RetirementOtherDocs");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_BloodGroupId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_GenderId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_OrganizationPositionId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_PositionLevelId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_PositionLineId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_PositionNumberId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_PositionPathId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_PositionPathSideId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_PositionTypeId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_RelationshipId",
table: "RetirementOthers");
migrationBuilder.DropIndex(
name: "IX_RetirementOthers_ReligionId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "Amount",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "BloodGroupId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "CitizenId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "DateOfBirth",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "EducationOld",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "Firstname",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "GenderId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "Lastname",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "Nationality",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "OrganizationPositionId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionDate",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionLevelId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionLineId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionNumberId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionPathId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionPathSideId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionTypeId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "Race",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "RecruitDate",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "RelationshipId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "ReligionId",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "TelephoneNumber",
table: "RetirementOthers");
migrationBuilder.RenameColumn(
name: "PrefixId",
table: "RetirementOthers",
newName: "ProfileId");
migrationBuilder.RenameIndex(
name: "IX_RetirementOthers_PrefixId",
table: "RetirementOthers",
newName: "IX_RetirementOthers_ProfileId");
migrationBuilder.AlterColumn<string>(
name: "Reason",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "เหตุผล",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "เหตุผลที่รับย้ายราชการ")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "OrganizationPositionOld",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "สังกัด",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "สังกัดเดิม")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<DateTime>(
name: "Date",
table: "RetirementOthers",
type: "datetime(6)",
nullable: true,
comment: "ตั้งแต่วันที่");
migrationBuilder.AddColumn<string>(
name: "Organization",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "หน่วยงานที่อื่นๆไป")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddForeignKey(
name: "FK_RetirementOthers_Profiles_ProfileId",
table: "RetirementOthers",
column: "ProfileId",
principalTable: "Profiles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}

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

File diff suppressed because it is too large Load diff

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

@ -90,7 +90,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.IsActive,
p.Reason,
p.EducationOld,
salary = p.AmountOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
@ -147,7 +147,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.CreatedAt,
p.Reason,
p.EducationOld,
salary = p.AmountOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
@ -197,7 +197,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.CreatedAt,
data.Reason,
data.EducationOld,
data.salary,
data.AmountOld,
data.PositionTypeOld,
data.PositionLevelOld,
data.PositionNumberOld,
@ -365,7 +365,6 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.PositionType = save;
}
uppdated.Amount = req.Amount;
uppdated.RecruitDate = req.RecruitDate;
uppdated.Status = "PENDING";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
@ -445,6 +444,7 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.PositionTypeOld = req.PositionTypeOld;
uppdated.PositionLevelOld = req.PositionLevelOld;
uppdated.PositionNumberOld = req.PositionNumberOld;
uppdated.Amount = req.Amount;
uppdated.AmountOld = req.AmountOld;
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
uppdated.LastUpdateUserId = UserId ?? "";

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

@ -90,7 +90,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.IsActive,
p.Reason,
p.EducationOld,
salary = p.AmountOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
@ -147,7 +147,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.CreatedAt,
p.Reason,
p.EducationOld,
salary = p.AmountOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
@ -197,7 +197,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.CreatedAt,
data.Reason,
data.EducationOld,
data.salary,
data.AmountOld,
data.PositionTypeOld,
data.PositionLevelOld,
data.PositionNumberOld,
@ -363,7 +363,6 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.PositionType = save;
}
uppdated.Amount = req.Amount;
uppdated.RecruitDate = req.RecruitDate;
uppdated.Status = "PENDING";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
@ -443,6 +442,7 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.PositionTypeOld = req.PositionTypeOld;
uppdated.PositionLevelOld = req.PositionLevelOld;
uppdated.PositionNumberOld = req.PositionNumberOld;
uppdated.Amount = req.Amount;
uppdated.AmountOld = req.AmountOld;
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
uppdated.LastUpdateUserId = UserId ?? "";

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

@ -12,6 +12,5 @@ namespace BMA.EHR.Placement.Service.Requests
public Guid? PositionLineId { get; set; }
public Guid? PositionPathSideId { get; set; }
public Guid? PositionTypeId { get; set; }
public double? Amount { get; set; }
}
}

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

@ -12,6 +12,5 @@ namespace BMA.EHR.Placement.Service.Requests
public Guid? PositionLineId { get; set; }
public Guid? PositionPathSideId { get; set; }
public Guid? PositionTypeId { get; set; }
public double? Amount { get; set; }
}
}

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

@ -23,6 +23,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? PositionTypeOld { get; set; }
public string? PositionLevelOld { get; set; }
public string? PositionNumberOld { get; set; }
public double? Amount { get; set; }
public double? AmountOld { get; set; }
}
}

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

@ -23,6 +23,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? PositionTypeOld { get; set; }
public string? PositionLevelOld { get; set; }
public string? PositionNumberOld { get; set; }
public double? Amount { get; set; }
public double? AmountOld { get; set; }
}
}

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

@ -91,7 +91,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.PositionDate,
p.Reason,
p.EducationOld,
salary = p.AmountOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
@ -148,7 +148,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.CreatedAt,
p.Reason,
p.EducationOld,
salary = p.AmountOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
@ -199,7 +199,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.CreatedAt,
data.Reason,
data.EducationOld,
data.salary,
data.AmountOld,
data.PositionTypeOld,
data.PositionLevelOld,
data.PositionNumberOld,
@ -366,7 +366,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
uppdated.PositionType = save;
}
uppdated.Amount = req.Amount;
uppdated.RecruitDate = req.RecruitDate;
uppdated.Status = "PENDING";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
@ -446,6 +445,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
uppdated.PositionTypeOld = req.PositionTypeOld;
uppdated.PositionLevelOld = req.PositionLevelOld;
uppdated.PositionNumberOld = req.PositionNumberOld;
uppdated.Amount = req.Amount;
uppdated.AmountOld = req.AmountOld;
uppdated.PositionDate = req.PositionDate;
uppdated.LastUpdateFullName = FullName ?? "System Administrator";

1
BMA.EHR.Retirement.Service/Requests/PersonSelectPositionOtherRequest.cs
View file

@ -12,6 +12,5 @@ namespace BMA.EHR.Retirement.Service.Requests
public Guid? PositionLineId { get; set; }
public Guid? PositionPathSideId { get; set; }
public Guid? PositionTypeId { get; set; }
public double? Amount { get; set; }
}
}

1
BMA.EHR.Retirement.Service/Requests/RetirementOtherEditRequest.cs
View file

@ -23,6 +23,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public string? PositionTypeOld { get; set; }
public string? PositionLevelOld { get; set; }
public string? PositionNumberOld { get; set; }
public double? Amount { get; set; }
public double? AmountOld { get; set; }
public DateTime? PositionDate { get; set; }
}