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

แก้คำสั่ง 21

Browse source
This commit is contained in:
Kittapath 2023-10-11 10:04:52 +07:00
parent be788b6311
commit a7c305a4d8
5 changed files with 16950 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
View file

@ -1069,7 +1069,7 @@ namespace BMA.EHR.Application.Repositories.Commands
Seq = r.Sequence.ToString().ToThaiNumber(), Seq = r.Sequence.ToString().ToThaiNumber(),
CitizenId = r.CitizenId.ToThaiNumber(), CitizenId = r.CitizenId.ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Organization = p.OrgEmployee!.OrganizationAgency!.OrganizationOrganization!.Name, Organization = p.OrgEmployee == null || p.OrgEmployee!.OrganizationAgency == null || p.OrgEmployee!.OrganizationAgency!.OrganizationOrganization == null ? "" : p.OrgEmployee!.OrganizationAgency!.OrganizationOrganization!.Name,
PositionName = p.OrgEmployee.PositionEmployeePosition == null ? "" : p.OrgEmployee.PositionEmployeePosition.Name.ToThaiNumber(), PositionName = p.OrgEmployee.PositionEmployeePosition == null ? "" : p.OrgEmployee.PositionEmployeePosition.Name.ToThaiNumber(),
PositionLevel = p.OrgEmployee.OrganizationPositionEmployeeLevels == null ? "" : p.OrgEmployee.OrganizationPositionEmployeeLevels.First().PositionEmployeeLevel.Name.ToThaiNumber(), PositionLevel = p.OrgEmployee.OrganizationPositionEmployeeLevels == null ? "" : p.OrgEmployee.OrganizationPositionEmployeeLevels.First().PositionEmployeeLevel.Name.ToThaiNumber(),
PositionType = p.Profile.PositionType == null ? "" : p.Profile.PositionType.Name.ToThaiNumber(), PositionType = p.Profile.PositionType == null ? "" : p.Profile.PositionType.Name.ToThaiNumber(),

16758
BMA.EHR.Infrastructure/Migrations/20231011015450_update table PlacementAppointment add employee.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

143
BMA.EHR.Infrastructure/Migrations/20231011015450_update table PlacementAppointment add employee.cs Normal file
View file

@ -0,0 +1,143 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablePlacementAppointmentaddemployee : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "OrgEmployeeId",
table: "PlacementAppointments",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "PositionEmployeeLineId",
table: "PlacementAppointments",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "PositionEmployeePositionId",
table: "PlacementAppointments",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.AddColumn<Guid>(
name: "PositionEmployeeStatusId",
table: "PlacementAppointments",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.CreateIndex(
name: "IX_PlacementAppointments_OrgEmployeeId",
table: "PlacementAppointments",
column: "OrgEmployeeId");
migrationBuilder.CreateIndex(
name: "IX_PlacementAppointments_PositionEmployeeLineId",
table: "PlacementAppointments",
column: "PositionEmployeeLineId");
migrationBuilder.CreateIndex(
name: "IX_PlacementAppointments_PositionEmployeePositionId",
table: "PlacementAppointments",
column: "PositionEmployeePositionId");
migrationBuilder.CreateIndex(
name: "IX_PlacementAppointments_PositionEmployeeStatusId",
table: "PlacementAppointments",
column: "PositionEmployeeStatusId");
migrationBuilder.AddForeignKey(
name: "FK_PlacementAppointments_OrganizationEmployees_OrgEmployeeId",
table: "PlacementAppointments",
column: "OrgEmployeeId",
principalTable: "OrganizationEmployees",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_PlacementAppointments_PositionEmployeeLines_PositionEmployee~",
table: "PlacementAppointments",
column: "PositionEmployeeLineId",
principalTable: "PositionEmployeeLines",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_PlacementAppointments_PositionEmployeePositions_PositionEmpl~",
table: "PlacementAppointments",
column: "PositionEmployeePositionId",
principalTable: "PositionEmployeePositions",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_PlacementAppointments_PositionEmployeeStatuses_PositionEmplo~",
table: "PlacementAppointments",
column: "PositionEmployeeStatusId",
principalTable: "PositionEmployeeStatuses",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_PlacementAppointments_OrganizationEmployees_OrgEmployeeId",
table: "PlacementAppointments");
migrationBuilder.DropForeignKey(
name: "FK_PlacementAppointments_PositionEmployeeLines_PositionEmployee~",
table: "PlacementAppointments");
migrationBuilder.DropForeignKey(
name: "FK_PlacementAppointments_PositionEmployeePositions_PositionEmpl~",
table: "PlacementAppointments");
migrationBuilder.DropForeignKey(
name: "FK_PlacementAppointments_PositionEmployeeStatuses_PositionEmplo~",
table: "PlacementAppointments");
migrationBuilder.DropIndex(
name: "IX_PlacementAppointments_OrgEmployeeId",
table: "PlacementAppointments");
migrationBuilder.DropIndex(
name: "IX_PlacementAppointments_PositionEmployeeLineId",
table: "PlacementAppointments");
migrationBuilder.DropIndex(
name: "IX_PlacementAppointments_PositionEmployeePositionId",
table: "PlacementAppointments");
migrationBuilder.DropIndex(
name: "IX_PlacementAppointments_PositionEmployeeStatusId",
table: "PlacementAppointments");
migrationBuilder.DropColumn(
name: "OrgEmployeeId",
table: "PlacementAppointments");
migrationBuilder.DropColumn(
name: "PositionEmployeeLineId",
table: "PlacementAppointments");
migrationBuilder.DropColumn(
name: "PositionEmployeePositionId",
table: "PlacementAppointments");
migrationBuilder.DropColumn(
name: "PositionEmployeeStatusId",
table: "PlacementAppointments");
}
}
}

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

@ -10819,6 +10819,9 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("varchar(100)") .HasColumnType("varchar(100)")
.HasComment("สัญชาติ"); .HasComment("สัญชาติ");
b.Property<Guid?>("OrgEmployeeId")
.HasColumnType("char(36)");
b.Property<Guid?>("OrganizationPositionId") b.Property<Guid?>("OrganizationPositionId")
.HasColumnType("char(36)"); .HasColumnType("char(36)");
@ -10830,6 +10833,15 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("datetime(6)") .HasColumnType("datetime(6)")
.HasComment("ดำรงตำแหน่งในระดับปัจจุบันเมื่อ"); .HasComment("ดำรงตำแหน่งในระดับปัจจุบันเมื่อ");
b.Property<Guid?>("PositionEmployeeLineId")
.HasColumnType("char(36)");
b.Property<Guid?>("PositionEmployeePositionId")
.HasColumnType("char(36)");
b.Property<Guid?>("PositionEmployeeStatusId")
.HasColumnType("char(36)");
b.Property<Guid?>("PositionLevelId") b.Property<Guid?>("PositionLevelId")
.HasColumnType("char(36)"); .HasColumnType("char(36)");
@ -10903,8 +10915,16 @@ namespace BMA.EHR.Infrastructure.Migrations
b.HasIndex("GenderId"); b.HasIndex("GenderId");
b.HasIndex("OrgEmployeeId");
b.HasIndex("OrganizationPositionId"); b.HasIndex("OrganizationPositionId");
b.HasIndex("PositionEmployeeLineId");
b.HasIndex("PositionEmployeePositionId");
b.HasIndex("PositionEmployeeStatusId");
b.HasIndex("PositionLevelId"); b.HasIndex("PositionLevelId");
b.HasIndex("PositionLineId"); b.HasIndex("PositionLineId");
@ -15589,10 +15609,26 @@ namespace BMA.EHR.Infrastructure.Migrations
.WithMany() .WithMany()
.HasForeignKey("GenderId"); .HasForeignKey("GenderId");
b.HasOne("BMA.EHR.Domain.Models.OrganizationEmployee.OrgEmployee", "OrgEmployee")
.WithMany()
.HasForeignKey("OrgEmployeeId");
b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationPositionEntity", "OrganizationPosition") b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationPositionEntity", "OrganizationPosition")
.WithMany() .WithMany()
.HasForeignKey("OrganizationPositionId"); .HasForeignKey("OrganizationPositionId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionEmployeeLine", "PositionEmployeeLine")
.WithMany()
.HasForeignKey("PositionEmployeeLineId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionEmployeePosition", "PositionEmployeePosition")
.WithMany()
.HasForeignKey("PositionEmployeePositionId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionEmployeeStatus", "PositionEmployeeStatus")
.WithMany()
.HasForeignKey("PositionEmployeeStatusId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionLevel", "PositionLevel") b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionLevel", "PositionLevel")
.WithMany() .WithMany()
.HasForeignKey("PositionLevelId"); .HasForeignKey("PositionLevelId");
@ -15643,8 +15679,16 @@ namespace BMA.EHR.Infrastructure.Migrations
b.Navigation("Gender"); b.Navigation("Gender");
b.Navigation("OrgEmployee");
b.Navigation("OrganizationPosition"); b.Navigation("OrganizationPosition");
b.Navigation("PositionEmployeeLine");
b.Navigation("PositionEmployeePosition");
b.Navigation("PositionEmployeeStatus");
b.Navigation("PositionLevel"); b.Navigation("PositionLevel");
b.Navigation("PositionLine"); b.Navigation("PositionLine");

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

@ -99,9 +99,11 @@ namespace BMA.EHR.Placement.Service.Controllers
PositionEmployeeLine = p.PositionEmployeeLine == null ? null : p.PositionEmployeeLine.Name, PositionEmployeeLine = p.PositionEmployeeLine == null ? null : p.PositionEmployeeLine.Name,
PositionEmployeePosition = p.PositionEmployeePosition == null ? null : p.PositionEmployeePosition.Name, PositionEmployeePosition = p.PositionEmployeePosition == null ? null : p.PositionEmployeePosition.Name,
// OrganizationShortName = x.OrganizationShortName == null ? null : x.OrganizationShortName.Name,
OrganizationPositionId = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id, OrganizationPositionId = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id,
OrganizationName = p.OrganizationPosition == null ? null : (p.OrganizationPosition.Organization == null ? null : (p.OrganizationPosition.Organization.OrganizationOrganization == null ? null : p.OrganizationPosition.Organization.OrganizationOrganization.Name)),//// // OrganizationName = p.OrganizationPosition == null ? null : (p.OrganizationPosition.Organization == null ? null : (p.OrganizationPosition.Organization.OrganizationOrganization == null ? null : p.OrganizationPosition.Organization.OrganizationOrganization.Name)),////
OrganizationShortName = p.OrganizationPosition == null ? null : (p.OrganizationPosition.Organization == null ? null : (p.OrganizationPosition.Organization.OrganizationShortName == null ? null : p.OrganizationPosition.Organization.OrganizationShortName.Name)),//// OrganizationName = p.OrgEmployee == null ? null : (p.OrgEmployee.OrganizationOrganization == null ? null : p.OrgEmployee.OrganizationOrganization.Name),
OrganizationShortName = p.OrgEmployee == null ? null : (p.OrgEmployee.OrganizationShortName == null ? null : p.OrgEmployee.OrganizationShortName.Name),
p.IsActive, p.IsActive,
p.PositionDate, p.PositionDate,
p.Reason, p.Reason,