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-03 17:39:10 +07:00
parent 18d75f4b04
commit db712d586a
41 changed files with 125142 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/release_Retirement.yaml vendored
View file

@ -17,7 +17,7 @@ env:
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:
# act workflow_dispatch -W .github/workflows/release_retirement.yaml --input IMAGE_VER=retirement-1.0.0 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd
# act workflow_dispatch -W .github/workflows/release_retirement.yaml --input IMAGE_VER=latest -s DOCKER_USER=admin -s DOCKER_PASS=FPTadmin2357 -s SSH_PASSWORD=FPTadmin2357
release-dev:
runs-on: ubuntu-latest
steps:

18
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -490,14 +490,14 @@ namespace BMA.EHR.Application.Repositories.Commands
// 2. Query
var appointPeople = await _dbContext.Set<PlacementAppointment>()
.Include(x => x.CommandType)
//.Include(x => x.CommandType)
//.Include(x => x.Prefix)
//.Include(x => x.OrganizationPosition)
//.ThenInclude(x => x!.Organization)
//.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
.Where(x => !otherCommandReceivers.Contains(x.citizenId))
.Where(x => x.Status.Trim().ToUpper() == "REPORT")
.Where(x => x.CommandType!.Id == command.CommandType!.Id)
//.Where(x => x.CommandType!.Id == command.CommandType!.Id)
.OrderBy(x => x.citizenId)
.ToListAsync();
@ -551,15 +551,15 @@ namespace BMA.EHR.Application.Repositories.Commands
// 2. Query
var appointPeople = await _dbContext.Set<PlacementAppointment>()
.Include(x => x.CommandType)
//.Include(x => x.CommandType)
//.Include(x => x.Prefix)
//.Include(x => x.OrganizationPosition)
//.ThenInclude(x => x!.Organization)
//.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
.Where(x => !otherCommandReceivers.Contains(x.citizenId))
.Where(x => x.Status.Trim().ToUpper() == "REPORT")
.Where(x => x.CommandType!.Id == command.CommandType!.Id)
.OrderBy(x => x.citizenId)
//.Where(x => x.CommandType!.Id == command.CommandType!.Id)
//.OrderBy(x => x.citizenId)
.ToListAsync();
// 3. Create new Record
@ -612,14 +612,14 @@ namespace BMA.EHR.Application.Repositories.Commands
// 2. Query
var appointPeople = await _dbContext.Set<PlacementAppointment>()
.Include(x => x.CommandType)
//.Include(x => x.CommandType)
//.Include(x => x.Prefix)
//.Include(x => x.OrganizationPosition)
//.ThenInclude(x => x!.Organization)
//.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
.Where(x => !otherCommandReceivers.Contains(x.citizenId))
.Where(x => x.Status.Trim().ToUpper() == "REPORT")
.Where(x => x.CommandType!.Id == command.CommandType!.Id)
//.Where(x => x.CommandType!.Id == command.CommandType!.Id)
.OrderBy(x => x.citizenId)
.ToListAsync();
@ -1630,7 +1630,7 @@ namespace BMA.EHR.Application.Repositories.Commands
// 2. Query
var appointPeople = await _dbContext.Set<PlacementAppointment>()
.Include(x => x.CommandType)
//.Include(x => x.CommandType)
//.Include(x => x.Prefix)
//.Include(x => x.OrganizationPosition)
//.ThenInclude(x => x!.Organization)
@ -10891,7 +10891,7 @@ namespace BMA.EHR.Application.Repositories.Commands
select new
{
r.RefPlacementProfileId,
Position = pf.positionName
Position = pf.position
}).ToListAsync();
if (data.Count > 0)

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

@ -11,56 +11,12 @@ namespace BMA.EHR.Domain.Models.Placement
{
public class PlacementAppointment : EntityBase
{
// [Required, Comment("Id User")]
// public Profile Profile { get; set; }
// [Required, MaxLength(20), Comment("เลขประจำตัวประชาชน")]
// public string? CitizenId { get; set; }
// [Required, Comment("คำนำหน้า")]
// public Prefix? Prefix { get; set; }
// [Required, Comment("ชื่อ")]
// public string? Firstname { get; set; }
// [Required, Comment("นามสกุล")]
// public string? Lastname { get; set; }
// [MaxLength(40), Comment("วันเกิด")]
// public DateTime DateOfBirth { get; set; }
// [Comment("Id เพศ")]
// public Gender? Gender { get; set; }
// [MaxLength(100), Comment("สัญชาติ")]
// public string? Nationality { get; set; }
// [MaxLength(100), Comment("เชื้อชาติ")]
// public string? Race { get; set; }
// [Comment("Id ศาสนา")]
// public Religion? Religion { get; set; }
// [Comment("Id กลุ่มเลือด")]
// public BloodGroup? BloodGroup { get; set; }
// [Comment("Id สถานะภาพ")]
// public Relationship? Relationship { get; set; }
// [MaxLength(50), Comment("เบอร์โทร")]
// public string? TelephoneNumber { get; set; }
[Comment("สถานะคำขอ")]
public string Status { get; set; } = "WAITTING";
// [Comment("Id เลขที่ตำแหน่ง")]
// public OrganizationPositionEntity? OrganizationPosition { get; set; }
[Comment("วันที่บรรจุ")]
public DateTime? RecruitDate { get; set; }
// [Comment("Id ตำแหน่งเลขที่")]
// public PositionNumberEntity? PositionNumber { get; set; }
// [Comment("Id ตำแหน่ง")]
// public PositionPath? PositionPath { get; set; }
// [Comment("Id ด้าน/สาขา")]
// public PositionPathSide? PositionPathSide { get; set; }
// [Comment("Id ประเภทตำแหน่ง")]
// public PositionType? PositionType { get; set; }
// [Comment("Id สายงาน")]
// public PositionLine? PositionLine { get; set; }
// [Comment("Id ระดับ")]
// public PositionLevel? PositionLevel { get; set; }
[Comment("วันที่รายงานตัว")]
public DateTime? ReportingDate { get; set; }
[Comment("ประเภทราชการ")]
public string? type { get; set; }
[Comment("เงินเดือน")]
@ -69,8 +25,12 @@ namespace BMA.EHR.Domain.Models.Placement
public string? Reason { get; set; }
[Comment("วุฒิ/สาขาเดิม")]
public string? EducationOld { get; set; }
[Comment("สังกัดเดิม")]
[Comment("สังกัด/ตำแหน่งเเดิม")]
public string? OrganizationPositionOld { get; set; }
[Comment("สังกัดเดิม")]
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท")]
public string? PositionTypeOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ระดับ")]
@ -81,12 +41,14 @@ namespace BMA.EHR.Domain.Models.Placement
public double? AmountOld { get; set; }
[Comment("สถานะการใช้งาน")]
public bool IsActive { get; set; } = true;
[Comment("ประเภทคำสั่ง")]
public CommandType? CommandType { get; set; }
// [Comment("ประเภทคำสั่ง")]
// public CommandType? CommandType { get; set; }
[Comment("ดำรงตำแหน่งในระดับปัจจุบันเมื่อ")]
public DateTime? PositionDate { get; set; }
[Comment("profile Id")]
public string? profileId { get; set; }
[Comment("คำนำหน้า")]
@ -97,6 +59,8 @@ namespace BMA.EHR.Domain.Models.Placement
public string? lastName { get; set; }
[Comment("เลขบัตรประชาชน")]
public string? citizenId { get; set; }
[MaxLength(40), Comment("วันเกิด")]
public DateTime? DateOfBirth { get; set; }
[Comment("ชื่อหน่วยงาน root")]
public string? root { get; set; }
[Comment("id หน่วยงาน root")]
@ -129,7 +93,6 @@ namespace BMA.EHR.Domain.Models.Placement
public string? child4ShortName { get; set; }
[Comment("ระดับโครงสร้าง")]
public int? node { get; set; }
[Comment("id โครงสร้าง")]
public Guid? nodeId { get; set; }
[Comment("id อัตรากำลัง")]
@ -143,7 +106,7 @@ namespace BMA.EHR.Domain.Models.Placement
[Comment("เลขที่ตำแหน่ง")]
public int? posMasterNo { get; set; }
[Comment("ชื่อตำแหน่งในสายงาน")]
public string? positionName { get; set; }
public string? position { get; set; }
[Comment("id ประเภทตำแหน่ง")]
public string? posTypeId { get; set; }
[Comment("ชื่อประเภทตำแหน่ง")]
@ -187,8 +150,6 @@ namespace BMA.EHR.Domain.Models.Placement
public string? child4OldId { get; set; }
[Comment("ชื่อย่อหน่วยงาน child4 old")]
public string? child4ShortNameOld { get; set; }
// [Comment("id revision old")]
// public string? orgRevisionId { get; set; }
[Comment("เลขที่ตำแหน่ง old")]
public int? posMasterNoOld { get; set; }
[Comment("ชื่อตำแหน่งในสายงาน old")]
@ -201,6 +162,8 @@ namespace BMA.EHR.Domain.Models.Placement
public string? posLevelOldId { get; set; }
[Comment("ชื่อระดับตำแหน่ง old")]
public string? posLevelNameOld { get; set; }
[Comment("ประเภทคำสั่ง")]
public string? typeCommand { get; set; }
// public OrgEmployee? OrgEmployee { get; set; }
// public PositionEmployeeStatus? PositionEmployeeStatus { get; set; }

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

@ -19,10 +19,12 @@ namespace BMA.EHR.Domain.Models.Placement
public string? PositionLevelOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม เลขที่")]
public string? PositionNumberOld { get; set; }
[Comment("สังกัดเดิม")]
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม เงินเดือน")]
public double? AmountOld { get; set; }
[Comment("สังกัด")]
public string? OrganizationPositionOld { get; set; }
[Comment("หน่วยงานที่ช่วยราชการไป")]

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

@ -10,18 +10,8 @@ namespace BMA.EHR.Domain.Models.Placement
{
public class PlacementReceive : EntityBase
{
// [Required, Comment("Id User")]
// public Profile Profile { get; set; }
[Comment("Fk Table Document")]
public Document? Avatar { get; set; }
// [Required, MaxLength(20), Comment("เลขประจำตัวประชาชน")]
// public string CitizenId { get; set; }
// [Required, Comment("คำนำหน้า")]
// public Prefix Prefix { get; set; }
// [Required, Comment("ชื่อ")]
// public string Firstname { get; set; }
// [Required, Comment("นามสกุล")]
// public string Lastname { get; set; }
[MaxLength(40), Comment("วันเกิด")]
public DateTime DateOfBirth { get; set; }
[Comment("Id เพศ")]
@ -40,36 +30,23 @@ namespace BMA.EHR.Domain.Models.Placement
public string? TelephoneNumber { get; set; }
[Comment("สถานะคำขอ")]
public string Status { get; set; } = "WAITTING";
// [Comment("Id เลขที่ตำแหน่ง")]
// public OrganizationPositionEntity? OrganizationPosition { get; set; }
[Comment("เงินเดือน")]
public double? Amount { get; set; }
[Comment("วันที่บรรจุ")]
public DateTime? RecruitDate { get; set; }
// [Comment("Id ตำแหน่งเลขที่")]
// public PositionNumberEntity? PositionNumber { get; set; }
// [Comment("Id ตำแหน่ง")]
// public PositionPath? PositionPath { get; set; }
// [Comment("Id ด้าน/สาขา")]
// public PositionPathSide? PositionPathSide { get; set; }
// [Comment("Id ประเภทตำแหน่ง")]
// public PositionType? PositionType { get; set; }
// [Comment("Id สายงาน")]
// public PositionLine? PositionLine { get; set; }
// [Comment("Id ระดับ")]
// public PositionLevel? PositionLevel { get; set; }
[Comment("เหตุผลที่รับโอนราชการ")]
public string? Reason { get; set; }
[Comment("วุฒิ/สาขาเดิม")]
public string? EducationOld { get; set; }
[Comment("สังกัดเดิม")]
public string? OrganizationPositionOld { get; set; }
[Comment("สังกัดเดิม")]
public string? OrganizationOld { get; set; }
[Comment("ตำแหน่งเดิม")]
public string? PositionOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท")]
public string? PositionTypeOld { get; set; }
[Comment("ข้อมูลหน่วยงานเดิม ระดับ")]
@ -80,6 +57,7 @@ namespace BMA.EHR.Domain.Models.Placement
public double? AmountOld { get; set; }
[Comment("profile Id")]
public string? profileId { get; set; }
[Comment("คำนำหน้า")]
@ -122,7 +100,6 @@ namespace BMA.EHR.Domain.Models.Placement
public string? child4ShortName { get; set; }
[Comment("ระดับโครงสร้าง")]
public int? node { get; set; }
[Comment("id โครงสร้าง")]
public Guid? nodeId { get; set; }
[Comment("id อัตรากำลัง")]
@ -136,7 +113,7 @@ namespace BMA.EHR.Domain.Models.Placement
[Comment("เลขที่ตำแหน่ง")]
public int? posMasterNo { get; set; }
[Comment("ชื่อตำแหน่งในสายงาน")]
public string? positionName { get; set; }
public string? position { get; set; }
[Comment("id ประเภทตำแหน่ง")]
public string? posTypeId { get; set; }
[Comment("ชื่อประเภทตำแหน่ง")]
@ -147,6 +124,50 @@ namespace BMA.EHR.Domain.Models.Placement
public string? posLevelName { get; set; }
[Comment("ชื่อหน่วยงาน root old")]
public string? rootOld { get; set; }
[Comment("id หน่วยงาน root old")]
public string? rootOldId { get; set; }
[Comment("ชื่อย่อหน่วยงาน root old")]
public string? rootShortNameOld { get; set; }
[Comment("ชื่อหน่วยงาน child1 old")]
public string? child1Old { get; set; }
[Comment("id หน่วยงาน child1 old")]
public string? child1OldId { get; set; }
[Comment("ชื่อย่อหน่วยงาน child1 old")]
public string? child1ShortNameOld { get; set; }
[Comment("ชื่อหน่วยงาน child2 old")]
public string? child2Old { get; set; }
[Comment("id หน่วยงาน child2 old")]
public string? child2OldId { get; set; }
[Comment("ชื่อย่อหน่วยงาน child2 old")]
public string? child2ShortNameOld { get; set; }
[Comment("ชื่อหน่วยงาน child3 old")]
public string? child3Old { get; set; }
[Comment("id หน่วยงาน child3 old")]
public string? child3OldId { get; set; }
[Comment("ชื่อย่อหน่วยงาน child3 old")]
public string? child3ShortNameOld { get; set; }
[Comment("ชื่อหน่วยงาน child4 old")]
public string? child4Old { get; set; }
[Comment("id หน่วยงาน child4 old")]
public string? child4OldId { get; set; }
[Comment("ชื่อย่อหน่วยงาน child4 old")]
public string? child4ShortNameOld { get; set; }
[Comment("เลขที่ตำแหน่ง old")]
public int? posMasterNoOld { get; set; }
[Comment("ชื่อตำแหน่งในสายงาน old")]
public string? positionOld { get; set; }
[Comment("id ประเภทตำแหน่ง old")]
public string? posTypeOldId { get; set; }
[Comment("ชื่อประเภทตำแหน่ง old")]
public string? posTypeNameOld { get; set; }
[Comment("id ระดับตำแหน่ง old")]
public string? posLevelOldId { get; set; }
[Comment("ชื่อระดับตำแหน่ง old")]
public string? posLevelNameOld { get; set; }
[Comment("สถานะการใช้งาน")]
public bool IsActive { get; set; } = true;
public virtual List<PlacementReceiveDoc> PlacementReceiveDocs { get; set; } = new List<PlacementReceiveDoc>();

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

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

4
BMA.EHR.Domain/Models/Retirement/RetirementDeceasedNoti.cs
View file

@ -10,8 +10,8 @@ namespace BMA.EHR.Domain.Models.Retirement
{
public class RetirementDeceasedNoti : EntityBase
{
[Comment("รหัสอ้างอิงผู้ใช้งานระบบ")]
public Profile ReceiveUser { get; set; }
// [Comment("รหัสอ้างอิงผู้ใช้งานระบบ")]
// public Profile ReceiveUser { get; set; }
[Comment("Fk Table RetirementDeceased")]
public RetirementDeceased RetirementDeceased { get; set; }

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

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

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

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

17550
BMA.EHR.Infrastructure/Migrations/20240502110245_update table PlacementRecive add profileid.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

28
BMA.EHR.Infrastructure/Migrations/20240502110245_update table PlacementRecive add profileid.cs Normal file
View file

@ -0,0 +1,28 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablePlacementReciveaddprofileid : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "positionName",
table: "PlacementReceives",
newName: "position");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "position",
table: "PlacementReceives",
newName: "positionName");
}
}
}

17682
BMA.EHR.Infrastructure/Migrations/20240502135321_update table PlacementRecive add profileid1.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

449
BMA.EHR.Infrastructure/Migrations/20240502135321_update table PlacementRecive add profileid1.cs Normal file
View file

@ -0,0 +1,449 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablePlacementReciveaddprofileid1 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "positionName",
table: "PlacementAppointments",
newName: "position");
migrationBuilder.AddColumn<string>(
name: "OrganizationOld",
table: "RetirementOuts",
type: "longtext",
nullable: true,
comment: "สังกัดเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionOld",
table: "RetirementOuts",
type: "longtext",
nullable: true,
comment: "ตำแหน่งเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "OrganizationOld",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "สังกัดเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionOld",
table: "RetirementOthers",
type: "longtext",
nullable: true,
comment: "ตำแหน่งเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "OrganizationOld",
table: "PlacementRepatriations",
type: "longtext",
nullable: true,
comment: "สังกัดเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionOld",
table: "PlacementRepatriations",
type: "longtext",
nullable: true,
comment: "ตำแหน่งเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "OrganizationOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "สังกัดเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ตำแหน่งเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child1Old",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อหน่วยงาน child1 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child1OldId",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "id หน่วยงาน child1 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child1ShortNameOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อย่อหน่วยงาน child1 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child2Old",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อหน่วยงาน child2 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child2OldId",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "id หน่วยงาน child2 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child2ShortNameOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อย่อหน่วยงาน child2 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child3Old",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อหน่วยงาน child3 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child3OldId",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "id หน่วยงาน child3 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child3ShortNameOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อย่อหน่วยงาน child3 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child4Old",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อหน่วยงาน child4 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child4OldId",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "id หน่วยงาน child4 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "child4ShortNameOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อย่อหน่วยงาน child4 old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "posLevelNameOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อระดับตำแหน่ง old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "posLevelOldId",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "id ระดับตำแหน่ง old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<int>(
name: "posMasterNoOld",
table: "PlacementReceives",
type: "int",
nullable: true,
comment: "เลขที่ตำแหน่ง old");
migrationBuilder.AddColumn<string>(
name: "posTypeNameOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อประเภทตำแหน่ง old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "posTypeOldId",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "id ประเภทตำแหน่ง old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "positionOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อตำแหน่งในสายงาน old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "rootOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อหน่วยงาน root old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "rootOldId",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "id หน่วยงาน root old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "rootShortNameOld",
table: "PlacementReceives",
type: "longtext",
nullable: true,
comment: "ชื่อย่อหน่วยงาน root old")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "OrganizationOld",
table: "PlacementOfficers",
type: "longtext",
nullable: true,
comment: "สังกัดเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionOld",
table: "PlacementOfficers",
type: "longtext",
nullable: true,
comment: "ตำแหน่งเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "OrganizationPositionOld",
table: "PlacementAppointments",
type: "longtext",
nullable: true,
comment: "สังกัด/ตำแหน่งเเดิม",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "สังกัดเดิม")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "OrganizationOld",
table: "PlacementAppointments",
type: "longtext",
nullable: true,
comment: "สังกัดเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionOld",
table: "PlacementAppointments",
type: "longtext",
nullable: true,
comment: "ตำแหน่งเดิม")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "OrganizationOld",
table: "RetirementOuts");
migrationBuilder.DropColumn(
name: "PositionOld",
table: "RetirementOuts");
migrationBuilder.DropColumn(
name: "OrganizationOld",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "PositionOld",
table: "RetirementOthers");
migrationBuilder.DropColumn(
name: "OrganizationOld",
table: "PlacementRepatriations");
migrationBuilder.DropColumn(
name: "PositionOld",
table: "PlacementRepatriations");
migrationBuilder.DropColumn(
name: "OrganizationOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "PositionOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child1Old",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child1OldId",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child1ShortNameOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child2Old",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child2OldId",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child2ShortNameOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child3Old",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child3OldId",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child3ShortNameOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child4Old",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child4OldId",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "child4ShortNameOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "posLevelNameOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "posLevelOldId",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "posMasterNoOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "posTypeNameOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "posTypeOldId",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "positionOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "rootOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "rootOldId",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "rootShortNameOld",
table: "PlacementReceives");
migrationBuilder.DropColumn(
name: "OrganizationOld",
table: "PlacementOfficers");
migrationBuilder.DropColumn(
name: "PositionOld",
table: "PlacementOfficers");
migrationBuilder.DropColumn(
name: "OrganizationOld",
table: "PlacementAppointments");
migrationBuilder.DropColumn(
name: "PositionOld",
table: "PlacementAppointments");
migrationBuilder.RenameColumn(
name: "position",
table: "PlacementAppointments",
newName: "positionName");
migrationBuilder.AlterColumn<string>(
name: "OrganizationPositionOld",
table: "PlacementAppointments",
type: "longtext",
nullable: true,
comment: "สังกัดเดิม",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "สังกัด/ตำแหน่งเเดิม")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
}
}

17682
BMA.EHR.Infrastructure/Migrations/20240503020659_update table PlacementRecive add profileid2.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

22
BMA.EHR.Infrastructure/Migrations/20240503020659_update table PlacementRecive add profileid2.cs Normal file
View file

@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablePlacementReciveaddprofileid2 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

17669
BMA.EHR.Infrastructure/Migrations/20240503032550_update table PlacementRecive remove ReceiveUser.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

52
BMA.EHR.Infrastructure/Migrations/20240503032550_update table PlacementRecive remove ReceiveUser.cs Normal file
View file

@ -0,0 +1,52 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablePlacementReciveremoveReceiveUser : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_RetirementDeceasedNotis_Profiles_ReceiveUserId",
table: "RetirementDeceasedNotis");
migrationBuilder.DropIndex(
name: "IX_RetirementDeceasedNotis_ReceiveUserId",
table: "RetirementDeceasedNotis");
migrationBuilder.DropColumn(
name: "ReceiveUserId",
table: "RetirementDeceasedNotis");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "ReceiveUserId",
table: "RetirementDeceasedNotis",
type: "char(36)",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
collation: "ascii_general_ci");
migrationBuilder.CreateIndex(
name: "IX_RetirementDeceasedNotis_ReceiveUserId",
table: "RetirementDeceasedNotis",
column: "ReceiveUserId");
migrationBuilder.AddForeignKey(
name: "FK_RetirementDeceasedNotis_Profiles_ReceiveUserId",
table: "RetirementDeceasedNotis",
column: "ReceiveUserId",
principalTable: "Profiles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}

17674
BMA.EHR.Infrastructure/Migrations/20240503033648_update table PlacementRecive add dateOfBirth.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

31
BMA.EHR.Infrastructure/Migrations/20240503033648_update table PlacementRecive add dateOfBirth.cs Normal file
View file

@ -0,0 +1,31 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablePlacementReciveadddateOfBirth : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "DateOfBirth",
table: "PlacementAppointments",
type: "datetime(6)",
maxLength: 40,
nullable: true,
comment: "วันเกิด");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "DateOfBirth",
table: "PlacementAppointments");
}
}
}

17664
BMA.EHR.Infrastructure/Migrations/20240503044201_update table PlacementRecive add typeCommand.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

62
BMA.EHR.Infrastructure/Migrations/20240503044201_update table PlacementRecive add typeCommand.cs Normal file
View file

@ -0,0 +1,62 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablePlacementReciveaddtypeCommand : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_PlacementAppointments_CommandTypes_CommandTypeId",
table: "PlacementAppointments");
migrationBuilder.DropIndex(
name: "IX_PlacementAppointments_CommandTypeId",
table: "PlacementAppointments");
migrationBuilder.DropColumn(
name: "CommandTypeId",
table: "PlacementAppointments");
migrationBuilder.AddColumn<string>(
name: "typeCommand",
table: "PlacementAppointments",
type: "longtext",
nullable: true,
comment: "ประเภทคำสั่ง")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "typeCommand",
table: "PlacementAppointments");
migrationBuilder.AddColumn<Guid>(
name: "CommandTypeId",
table: "PlacementAppointments",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.CreateIndex(
name: "IX_PlacementAppointments_CommandTypeId",
table: "PlacementAppointments",
column: "CommandTypeId");
migrationBuilder.AddForeignKey(
name: "FK_PlacementAppointments_CommandTypes_CommandTypeId",
table: "PlacementAppointments",
column: "CommandTypeId",
principalTable: "CommandTypes",
principalColumn: "Id");
}
}
}

17668
BMA.EHR.Infrastructure/Migrations/20240503061857_update table PlacementRecive add reportdate.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

30
BMA.EHR.Infrastructure/Migrations/20240503061857_update table PlacementRecive add reportdate.cs Normal file
View file

@ -0,0 +1,30 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablePlacementReciveaddreportdate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "ReportingDate",
table: "PlacementAppointments",
type: "datetime(6)",
nullable: true,
comment: "วันที่รายงานตัว");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ReportingDate",
table: "PlacementAppointments");
}
}
}

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

@ -11084,9 +11084,6 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("double")
.HasComment("ข้อมูลหน่วยงานเดิม เงินเดือน");
b.Property<Guid?>("CommandTypeId")
.HasColumnType("char(36)");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime(6)")
.HasColumnOrder(100)
@ -11106,6 +11103,11 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnOrder(101)
.HasComment("User Id ที่สร้างข้อมูล");
b.Property<DateTime?>("DateOfBirth")
.HasMaxLength(40)
.HasColumnType("datetime(6)")
.HasComment("วันเกิด");
b.Property<string>("EducationOld")
.HasColumnType("longtext")
.HasComment("วุฒิ/สาขาเดิม");
@ -11133,10 +11135,14 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnOrder(102)
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
b.Property<string>("OrganizationPositionOld")
b.Property<string>("OrganizationOld")
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
b.Property<string>("OrganizationPositionOld")
.HasColumnType("longtext")
.HasComment("สังกัด/ตำแหน่งเเดิม");
b.Property<DateTime?>("PositionDate")
.HasColumnType("datetime(6)")
.HasComment("ดำรงตำแหน่งในระดับปัจจุบันเมื่อ");
@ -11149,6 +11155,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม เลขที่");
b.Property<string>("PositionOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งเดิม");
b.Property<string>("PositionTypeOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท");
@ -11161,6 +11171,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("datetime(6)")
.HasComment("วันที่บรรจุ");
b.Property<DateTime?>("ReportingDate")
.HasColumnType("datetime(6)")
.HasComment("วันที่รายงานตัว");
b.Property<string>("Status")
.IsRequired()
.HasColumnType("longtext")
@ -11326,6 +11340,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("id ประเภทตำแหน่ง old");
b.Property<string>("position")
.HasColumnType("longtext")
.HasComment("ชื่อตำแหน่งในสายงาน");
b.Property<string>("positionField")
.HasColumnType("longtext")
.HasComment("สายงาน");
@ -11334,10 +11352,6 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("id ตำแหน่ง");
b.Property<string>("positionName")
.HasColumnType("longtext")
.HasComment("ชื่อตำแหน่งในสายงาน");
b.Property<string>("positionOld")
.HasColumnType("longtext")
.HasComment("ชื่อตำแหน่งในสายงาน old");
@ -11382,9 +11396,11 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ประเภทราชการ");
b.HasKey("Id");
b.Property<string>("typeCommand")
.HasColumnType("longtext")
.HasComment("ประเภทคำสั่ง");
b.HasIndex("CommandTypeId");
b.HasKey("Id");
b.ToTable("PlacementAppointments");
});
@ -11790,6 +11806,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("หน่วยงานที่ช่วยราชการไป");
b.Property<string>("OrganizationOld")
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
b.Property<string>("OrganizationPositionOld")
.HasColumnType("longtext")
.HasComment("สังกัด");
@ -11802,6 +11822,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม เลขที่");
b.Property<string>("PositionOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งเดิม");
b.Property<string>("PositionTypeOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท");
@ -12650,6 +12674,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("varchar(100)")
.HasComment("สัญชาติ");
b.Property<string>("OrganizationOld")
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
b.Property<string>("OrganizationPositionOld")
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
@ -12662,6 +12690,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม เลขที่");
b.Property<string>("PositionOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งเดิม");
b.Property<string>("PositionTypeOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท");
@ -12703,10 +12735,22 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("id หน่วยงาน child1");
b.Property<string>("child1Old")
.HasColumnType("longtext")
.HasComment("ชื่อหน่วยงาน child1 old");
b.Property<string>("child1OldId")
.HasColumnType("longtext")
.HasComment("id หน่วยงาน child1 old");
b.Property<string>("child1ShortName")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน child1");
b.Property<string>("child1ShortNameOld")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน child1 old");
b.Property<string>("child2")
.HasColumnType("longtext")
.HasComment("ชื่อหน่วยงาน child2");
@ -12715,10 +12759,22 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("id หน่วยงาน child2");
b.Property<string>("child2Old")
.HasColumnType("longtext")
.HasComment("ชื่อหน่วยงาน child2 old");
b.Property<string>("child2OldId")
.HasColumnType("longtext")
.HasComment("id หน่วยงาน child2 old");
b.Property<string>("child2ShortName")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน child2");
b.Property<string>("child2ShortNameOld")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน child2 old");
b.Property<string>("child3")
.HasColumnType("longtext")
.HasComment("ชื่อหน่วยงาน child3");
@ -12727,10 +12783,22 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("id หน่วยงาน child3");
b.Property<string>("child3Old")
.HasColumnType("longtext")
.HasComment("ชื่อหน่วยงาน child3 old");
b.Property<string>("child3OldId")
.HasColumnType("longtext")
.HasComment("id หน่วยงาน child3 old");
b.Property<string>("child3ShortName")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน child3");
b.Property<string>("child3ShortNameOld")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน child3 old");
b.Property<string>("child4")
.HasColumnType("longtext")
.HasComment("ชื่อหน่วยงาน child4");
@ -12739,10 +12807,22 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("id หน่วยงาน child4");
b.Property<string>("child4Old")
.HasColumnType("longtext")
.HasComment("ชื่อหน่วยงาน child4 old");
b.Property<string>("child4OldId")
.HasColumnType("longtext")
.HasComment("id หน่วยงาน child4 old");
b.Property<string>("child4ShortName")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน child4");
b.Property<string>("child4ShortNameOld")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน child4 old");
b.Property<string>("citizenId")
.HasColumnType("longtext")
.HasComment("เลขบัตรประชาชน");
@ -12775,10 +12855,22 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ชื่อระดับตำแหน่ง");
b.Property<string>("posLevelNameOld")
.HasColumnType("longtext")
.HasComment("ชื่อระดับตำแหน่ง old");
b.Property<string>("posLevelOldId")
.HasColumnType("longtext")
.HasComment("id ระดับตำแหน่ง old");
b.Property<int?>("posMasterNo")
.HasColumnType("int")
.HasComment("เลขที่ตำแหน่ง");
b.Property<int?>("posMasterNoOld")
.HasColumnType("int")
.HasComment("เลขที่ตำแหน่ง old");
b.Property<string>("posTypeId")
.HasColumnType("longtext")
.HasComment("id ประเภทตำแหน่ง");
@ -12787,6 +12879,18 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ชื่อประเภทตำแหน่ง");
b.Property<string>("posTypeNameOld")
.HasColumnType("longtext")
.HasComment("ชื่อประเภทตำแหน่ง old");
b.Property<string>("posTypeOldId")
.HasColumnType("longtext")
.HasComment("id ประเภทตำแหน่ง old");
b.Property<string>("position")
.HasColumnType("longtext")
.HasComment("ชื่อตำแหน่งในสายงาน");
b.Property<string>("positionField")
.HasColumnType("longtext")
.HasComment("สายงาน");
@ -12795,9 +12899,9 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("id ตำแหน่ง");
b.Property<string>("positionName")
b.Property<string>("positionOld")
.HasColumnType("longtext")
.HasComment("ชื่อตำแหน่งในสายงาน");
.HasComment("ชื่อตำแหน่งในสายงาน old");
b.Property<string>("posmasterId")
.HasColumnType("longtext")
@ -12819,10 +12923,22 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("id หน่วยงาน root");
b.Property<string>("rootOld")
.HasColumnType("longtext")
.HasComment("ชื่อหน่วยงาน root old");
b.Property<string>("rootOldId")
.HasColumnType("longtext")
.HasComment("id หน่วยงาน root old");
b.Property<string>("rootShortName")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน root");
b.Property<string>("rootShortNameOld")
.HasColumnType("longtext")
.HasComment("ชื่อย่อหน่วยงาน root old");
b.HasKey("Id");
b.HasIndex("AvatarId");
@ -13227,6 +13343,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("หน่วยงานที่ส่งตัวกลับไป");
b.Property<string>("OrganizationOld")
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
b.Property<string>("OrganizationPositionOld")
.HasColumnType("longtext")
.HasComment("สังกัด");
@ -13239,6 +13359,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม เลขที่");
b.Property<string>("PositionOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งเดิม");
b.Property<string>("PositionTypeOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท");
@ -13952,9 +14076,6 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("varchar(50)")
.HasComment("คำนำหน้านาม");
b.Property<Guid>("ReceiveUserId")
.HasColumnType("char(36)");
b.Property<Guid>("RetirementDeceasedId")
.HasColumnType("char(36)");
@ -13962,8 +14083,6 @@ namespace BMA.EHR.Infrastructure.Migrations
b.HasIndex("DocumentId");
b.HasIndex("ReceiveUserId");
b.HasIndex("RetirementDeceasedId");
b.ToTable("RetirementDeceasedNotis");
@ -14235,6 +14354,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("datetime(6)")
.HasComment("วันที่พ้นจากราชการทหาร");
b.Property<string>("OrganizationOld")
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
b.Property<string>("OrganizationPositionOld")
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
@ -14251,6 +14374,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม เลขที่");
b.Property<string>("PositionOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งเดิม");
b.Property<string>("PositionTypeOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท");
@ -14504,6 +14631,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("หน่วยงานที่ให้ออกไป");
b.Property<string>("OrganizationOld")
.HasColumnType("longtext")
.HasComment("สังกัดเดิม");
b.Property<string>("OrganizationPositionOld")
.HasColumnType("longtext")
.HasComment("สังกัด");
@ -14516,6 +14647,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม เลขที่");
b.Property<string>("PositionOld")
.HasColumnType("longtext")
.HasComment("ตำแหน่งเดิม");
b.Property<string>("PositionTypeOld")
.HasColumnType("longtext")
.HasComment("ข้อมูลหน่วยงานเดิม ตำแหน่งประเภท");
@ -16662,15 +16797,6 @@ namespace BMA.EHR.Infrastructure.Migrations
b.Navigation("PlacementType");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Placement.PlacementAppointment", b =>
{
b.HasOne("BMA.EHR.Domain.Models.Commands.Core.CommandType", "CommandType")
.WithMany()
.HasForeignKey("CommandTypeId");
b.Navigation("CommandType");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Placement.PlacementAppointmentDoc", b =>
{
b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "Document")
@ -17115,12 +17241,6 @@ namespace BMA.EHR.Infrastructure.Migrations
.WithMany()
.HasForeignKey("DocumentId");
b.HasOne("BMA.EHR.Domain.Models.HR.Profile", "ReceiveUser")
.WithMany()
.HasForeignKey("ReceiveUserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("BMA.EHR.Domain.Models.Retirement.RetirementDeceased", "RetirementDeceased")
.WithMany("RetirementDeceasedNotis")
.HasForeignKey("RetirementDeceasedId")
@ -17129,8 +17249,6 @@ namespace BMA.EHR.Infrastructure.Migrations
b.Navigation("Document");
b.Navigation("ReceiveUser");
b.Navigation("RetirementDeceased");
});

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

@ -67,49 +67,72 @@ namespace BMA.EHR.Placement.Service.Controllers
[HttpGet()]
public async Task<ActionResult<ResponseObject>> GetListByAdmin()
{
var placementAppointments = await _context.PlacementAppointments.AsQueryable()
.Where(x => x.type == "OFFICER")
.OrderByDescending(x => x.CreatedAt)
.Select(p => new
{
p.Id,
p.profileId,
p.prefix,
p.firstName,
p.lastName,
p.citizenId,
p.DateOfBirth,
p.root,
p.rootId,
p.rootShortName,
p.child1,
p.child1Id,
p.child1ShortName,
p.child2,
p.child2Id,
p.child2ShortName,
p.child3,
p.child3Id,
p.child3ShortName,
p.child4,
p.child4Id,
p.child4ShortName,
p.orgRevisionId,
p.positionId,
p.posMasterNo,
p.positionName,
p.posLevelName,
p.position,
p.positionField,
p.posTypeId,
p.posTypeName,
p.posLevelId,
p.posLevelName,
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.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.positionOld,
p.posLevelNameOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
p.posLevelNameOld,
p.Status,
p.Amount,
p.RecruitDate,
p.ReportingDate,
p.IsActive,
p.PositionDate,
@ -120,8 +143,12 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.AmountOld,
p.OrganizationOld,
p.posmasterId,
p.PositionOld,
p.CreatedAt,
CommandType = p.CommandType == null ? null : p.CommandType.Name,
p.typeCommand,
})
.ToListAsync();
// if (PlacementAdmin == true)
@ -149,38 +176,55 @@ namespace BMA.EHR.Placement.Service.Controllers
{
p.Id,
p.profileId,
p.DateOfBirth,
p.prefix,
p.firstName,
p.lastName,
p.root,
p.rootId,
p.rootShortName,
p.child1,
p.child1Id,
p.child1ShortName,
p.child2,
p.child2Id,
p.child2ShortName,
p.child3,
p.child3Id,
p.child3ShortName,
p.child4,
p.child4Id,
p.child4ShortName,
p.orgRevisionId,
p.positionId,
p.posMasterNo,
p.positionName,
p.posLevelName,
p.position,
p.positionField,
p.posTypeId,
p.posTypeName,
p.posLevelId,
p.posLevelName,
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.positionOld,
p.posLevelNameOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
p.posLevelNameOld,
p.Status,
p.Amount,
@ -195,8 +239,11 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionDate,
p.AmountOld,
p.OrganizationOld,
p.PositionOld,
// PlacementAppointmentDocs = p.PlacementAppointmentDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
CommandType = p.CommandType == null ? null : p.CommandType.Name,
p.typeCommand,
})
.FirstOrDefaultAsync();
if (data == null)
@ -212,61 +259,88 @@ namespace BMA.EHR.Placement.Service.Controllers
// };
// placementAppointmentDocs.Add(_doc);
// }
// var _data = new
// {
// data.Id,
// data.profileId,
// data.prefix,
// data.firstName,
// data.lastName,
// data.root,
// data.rootShortName,
// data.child1,
// data.child1ShortName,
// data.child2,
// data.child2ShortName,
// data.child3,
// data.child3ShortName,
// data.child4,
// data.child4ShortName,
// data.posMasterNo,
// data.positionName,
// data.posLevelName,
// data.posTypeName,
var _data = new
{
data.Id,
data.profileId,
data.prefix,
data.firstName,
data.lastName,
data.DateOfBirth,
data.root,
data.rootShortName,
data.child1,
data.child1Id,
data.child1ShortName,
data.child2,
data.child2Id,
data.child2ShortName,
data.child3,
data.child3Id,
data.child3ShortName,
data.child4,
data.child4Id,
data.child4ShortName,
node = data.root == null ? (int?)null : (data.child1 == null ? 0 : (data.child2 == null ? 1 : (data.child3 == null ? 2 : (data.child4 == null ? 3 : 4)))),
nodeName = data.root == null ? null : (data.child1 == null ? data.root : (data.child2 == null ? data.child1 : (data.child3 == null ? data.child2 : (data.child4 == null ? data.child3 : data.child4)))),
nodeId = data.rootId == null ? null : (data.child1Id == null ? data.rootId : (data.child2Id == null ? data.child1Id : (data.child3Id == null ? data.child2Id : (data.child4Id == null ? data.child3Id : data.child4Id)))),
nodeShortName = data.rootShortName == null ? null : (data.child1ShortName == null ? data.rootShortName : (data.child2ShortName == null ? data.child1ShortName : (data.child3ShortName == null ? data.child2ShortName : (data.child4ShortName == null ? data.child3ShortName : data.child4ShortName)))),
data.orgRevisionId,
data.positionId,
data.posMasterNo,
data.position,
data.positionField,
data.posTypeId,
data.posTypeName,
data.posLevelId,
data.posLevelName,
// data.rootOld,
// data.rootShortNameOld,
// data.child1Old,
// data.child1ShortNameOld,
// data.child2Old,
// data.child2ShortNameOld,
// data.child3Old,
// data.child3ShortNameOld,
// data.child4Old,
// data.child4ShortNameOld,
// data.posMasterNoOld,
// data.positionOld,
// data.posLevelNameOld,
// data.posTypeNameOld,
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,
nodeOld = data.rootOld == null ? (int?)null : (data.child1Old == null ? 0 : (data.child2Old == null ? 1 : (data.child3Old == null ? 2 : (data.child4Old == null ? 3 : 4)))),
nodeNameOld = data.rootOld == null ? null : (data.child1Old == null ? data.root : (data.child2Old == null ? data.child1Old : (data.child3Old == null ? data.child2Old : (data.child4Old == null ? data.child3Old : data.child4Old)))),
nodeOldId = data.rootOldId == null ? null : (data.child1OldId == null ? data.rootOldId : (data.child2OldId == null ? data.child1OldId : (data.child3OldId == null ? data.child2OldId : (data.child4OldId == null ? data.child3OldId : data.child4OldId)))),
nodeShortNameOld = data.rootShortNameOld == null ? null : (data.child1ShortNameOld == null ? data.rootShortNameOld : (data.child2ShortNameOld == null ? data.child1ShortNameOld : (data.child3ShortNameOld == null ? data.child2ShortNameOld : (data.child4ShortNameOld == null ? data.child3ShortNameOld : data.child4ShortNameOld)))),
data.posMasterNoOld,
data.posTypeOldId,
data.posTypeNameOld,
data.posLevelOldId,
data.posLevelNameOld,
// data.Status,
// data.Amount,
// data.RecruitDate,
data.Status,
data.Amount,
data.RecruitDate,
// data.CreatedAt,
// data.Reason,
// data.EducationOld,
// data.salary,
// data.PositionTypeOld,
// data.PositionLevelOld,
// data.PositionNumberOld,
// data.OrganizationPositionOld,
// data.PositionDate,
// Docs = placementAppointmentDocs,
// data.CommandType,
// };
data.CreatedAt,
data.Reason,
data.EducationOld,
data.salary,
data.PositionTypeOld,
data.PositionLevelOld,
data.PositionNumberOld,
data.OrganizationPositionOld,
data.PositionDate,
data.AmountOld,
data.OrganizationOld,
data.PositionOld,
// Docs = placementAppointmentDocs,
data.typeCommand,
};
return Success(data);
return Success(_data);
}
/// <summary>
@ -329,6 +403,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementAppointment.firstName = org.result.firstName;
placementAppointment.lastName = org.result.lastName;
placementAppointment.citizenId = org.result.citizenId;
placementAppointment.DateOfBirth = org.result.birthDate;
placementAppointment.rootOld = org.result.root;
placementAppointment.rootOldId = org.result.rootId;
placementAppointment.rootShortNameOld = org.result.rootShortName;
@ -345,11 +420,24 @@ namespace BMA.EHR.Placement.Service.Controllers
placementAppointment.child4OldId = org.result.child4Id;
placementAppointment.child4ShortNameOld = org.result.child4ShortName;
placementAppointment.posMasterNoOld = org.result.posMasterNo;
placementAppointment.positionOld = org.result.position;
placementAppointment.posTypeOldId = org.result.posTypeId;
placementAppointment.posTypeNameOld = org.result.posTypeName;
placementAppointment.posLevelOldId = org.result.posLevelId;
placementAppointment.posLevelNameOld = org.result.posLevelName;
// placementAppointment.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}";
// placementAppointment.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount;
placementAppointment.PositionOld = org.result.position;
placementAppointment.PositionLevelOld = org.result.posLevelName;
placementAppointment.PositionTypeOld = org.result.posTypeName;
placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(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 + "/");
placementAppointment.OrganizationPositionOld = org.result.position + "-" + placementAppointment.OrganizationOld;
}
await _context.PlacementAppointments.AddAsync(placementAppointment);
await _context.SaveChangesAsync();
@ -436,20 +524,21 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.child4ShortName = req.node <= 3 ? null : org.result.child4ShortName;
}
uppdated.typeCommand = req.typeCommand == null ? null : req.typeCommand.Trim().ToUpper();
uppdated.posmasterId = req.posmasterId;
uppdated.node = req.node;
uppdated.nodeId = req.nodeId;
uppdated.orgRevisionId = req.orgRevisionId;
uppdated.positionId = req.positionId;
uppdated.posMasterNo = req.posMasterNo;
uppdated.positionName = req.positionName;
uppdated.position = req.position;
uppdated.positionField = req.positionField;
uppdated.posTypeId = req.posTypeId;
uppdated.posTypeName = req.posTypeName;
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 ?? "";
@ -559,7 +648,7 @@ namespace BMA.EHR.Placement.Service.Controllers
if (uppdated == null)
continue;
uppdated.CommandType = await _context.CommandTypes.FindAsync(commandTypeId);
// uppdated.CommandType = await _context.CommandTypes.FindAsync(commandTypeId);
uppdated.Status = "REPORT";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
uppdated.LastUpdateUserId = UserId ?? "";

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

@ -67,49 +67,72 @@ namespace BMA.EHR.Placement.Service.Controllers
[HttpGet()]
public async Task<ActionResult<ResponseObject>> GetListByAdmin()
{
var placementAppointments = await _context.PlacementAppointments.AsQueryable()
.Where(x => x.type == "EMPLOYEE")
.OrderByDescending(x => x.CreatedAt)
.Select(p => new
{
p.Id,
p.profileId,
p.prefix,
p.firstName,
p.lastName,
p.citizenId,
p.DateOfBirth,
p.root,
p.rootId,
p.rootShortName,
p.child1,
p.child1Id,
p.child1ShortName,
p.child2,
p.child2Id,
p.child2ShortName,
p.child3,
p.child3Id,
p.child3ShortName,
p.child4,
p.child4Id,
p.child4ShortName,
p.orgRevisionId,
p.positionId,
p.posMasterNo,
p.positionName,
p.posLevelName,
p.position,
p.positionField,
p.posTypeId,
p.posTypeName,
p.posLevelId,
p.posLevelName,
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.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.positionOld,
p.posLevelNameOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
p.posLevelNameOld,
p.Status,
p.Amount,
p.RecruitDate,
p.ReportingDate,
p.IsActive,
p.PositionDate,
@ -120,8 +143,12 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.AmountOld,
p.OrganizationOld,
p.posmasterId,
p.PositionOld,
p.CreatedAt,
CommandType = p.CommandType == null ? null : p.CommandType.Name,
p.typeCommand,
})
.ToListAsync();
@ -150,35 +177,52 @@ namespace BMA.EHR.Placement.Service.Controllers
p.prefix,
p.firstName,
p.lastName,
p.DateOfBirth,
p.root,
p.rootId,
p.rootShortName,
p.child1,
p.child1Id,
p.child1ShortName,
p.child2,
p.child2Id,
p.child2ShortName,
p.child3,
p.child3Id,
p.child3ShortName,
p.child4,
p.child4Id,
p.child4ShortName,
p.orgRevisionId,
p.positionId,
p.posMasterNo,
p.positionName,
p.posLevelName,
p.position,
p.positionField,
p.posTypeId,
p.posTypeName,
p.posLevelId,
p.posLevelName,
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.positionOld,
p.posLevelNameOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
p.posLevelNameOld,
p.Status,
p.Amount,
@ -193,8 +237,11 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionDate,
p.AmountOld,
p.OrganizationOld,
p.PositionOld,
// PlacementAppointmentDocs = p.PlacementAppointmentDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
CommandType = p.CommandType == null ? null : p.CommandType.Name,
p.typeCommand,
})
.FirstOrDefaultAsync();
if (data == null)
@ -210,61 +257,88 @@ namespace BMA.EHR.Placement.Service.Controllers
// };
// placementAppointmentDocs.Add(_doc);
// }
// var _data = new
// {
// data.Id,
// data.profileId,
// data.prefix,
// data.firstName,
// data.lastName,
// data.root,
// data.rootShortName,
// data.child1,
// data.child1ShortName,
// data.child2,
// data.child2ShortName,
// data.child3,
// data.child3ShortName,
// data.child4,
// data.child4ShortName,
// data.posMasterNo,
// data.positionName,
// data.posLevelName,
// data.posTypeName,
var _data = new
{
data.Id,
data.profileId,
data.prefix,
data.firstName,
data.lastName,
data.DateOfBirth,
data.root,
data.rootShortName,
data.child1,
data.child1Id,
data.child1ShortName,
data.child2,
data.child2Id,
data.child2ShortName,
data.child3,
data.child3Id,
data.child3ShortName,
data.child4,
data.child4Id,
data.child4ShortName,
node = data.root == null ? (int?)null : (data.child1 == null ? 0 : (data.child2 == null ? 1 : (data.child3 == null ? 2 : (data.child4 == null ? 3 : 4)))),
nodeName = data.root == null ? null : (data.child1 == null ? data.root : (data.child2 == null ? data.child1 : (data.child3 == null ? data.child2 : (data.child4 == null ? data.child3 : data.child4)))),
nodeId = data.rootId == null ? null : (data.child1Id == null ? data.rootId : (data.child2Id == null ? data.child1Id : (data.child3Id == null ? data.child2Id : (data.child4Id == null ? data.child3Id : data.child4Id)))),
nodeShortName = data.rootShortName == null ? null : (data.child1ShortName == null ? data.rootShortName : (data.child2ShortName == null ? data.child1ShortName : (data.child3ShortName == null ? data.child2ShortName : (data.child4ShortName == null ? data.child3ShortName : data.child4ShortName)))),
data.orgRevisionId,
data.positionId,
data.posMasterNo,
data.position,
data.positionField,
data.posTypeId,
data.posTypeName,
data.posLevelId,
data.posLevelName,
// data.rootOld,
// data.rootShortNameOld,
// data.child1Old,
// data.child1ShortNameOld,
// data.child2Old,
// data.child2ShortNameOld,
// data.child3Old,
// data.child3ShortNameOld,
// data.child4Old,
// data.child4ShortNameOld,
// data.posMasterNoOld,
// data.positionOld,
// data.posLevelNameOld,
// data.posTypeNameOld,
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,
nodeOld = data.rootOld == null ? (int?)null : (data.child1Old == null ? 0 : (data.child2Old == null ? 1 : (data.child3Old == null ? 2 : (data.child4Old == null ? 3 : 4)))),
nodeNameOld = data.rootOld == null ? null : (data.child1Old == null ? data.root : (data.child2Old == null ? data.child1Old : (data.child3Old == null ? data.child2Old : (data.child4Old == null ? data.child3Old : data.child4Old)))),
nodeOldId = data.rootOldId == null ? null : (data.child1OldId == null ? data.rootOldId : (data.child2OldId == null ? data.child1OldId : (data.child3OldId == null ? data.child2OldId : (data.child4OldId == null ? data.child3OldId : data.child4OldId)))),
nodeShortNameOld = data.rootShortNameOld == null ? null : (data.child1ShortNameOld == null ? data.rootShortNameOld : (data.child2ShortNameOld == null ? data.child1ShortNameOld : (data.child3ShortNameOld == null ? data.child2ShortNameOld : (data.child4ShortNameOld == null ? data.child3ShortNameOld : data.child4ShortNameOld)))),
data.posMasterNoOld,
data.posTypeOldId,
data.posTypeNameOld,
data.posLevelOldId,
data.posLevelNameOld,
// data.Status,
// data.Amount,
// data.RecruitDate,
data.Status,
data.Amount,
data.RecruitDate,
// data.CreatedAt,
// data.Reason,
// data.EducationOld,
// data.salary,
// data.PositionTypeOld,
// data.PositionLevelOld,
// data.PositionNumberOld,
// data.OrganizationPositionOld,
// data.PositionDate,
// Docs = placementAppointmentDocs,
// data.CommandType,
// };
data.CreatedAt,
data.Reason,
data.EducationOld,
data.salary,
data.PositionTypeOld,
data.PositionLevelOld,
data.PositionNumberOld,
data.OrganizationPositionOld,
data.PositionDate,
data.AmountOld,
data.OrganizationOld,
data.PositionOld,
// Docs = placementAppointmentDocs,
data.typeCommand,
};
return Success(data);
return Success(_data);
}
/// <summary>
@ -327,6 +401,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementAppointment.firstName = org.result.firstName;
placementAppointment.lastName = org.result.lastName;
placementAppointment.citizenId = org.result.citizenId;
placementAppointment.DateOfBirth = org.result.birthDate;
placementAppointment.rootOld = org.result.root;
placementAppointment.rootOldId = org.result.rootId;
placementAppointment.rootShortNameOld = org.result.rootShortName;
@ -343,11 +418,24 @@ namespace BMA.EHR.Placement.Service.Controllers
placementAppointment.child4OldId = org.result.child4Id;
placementAppointment.child4ShortNameOld = org.result.child4ShortName;
placementAppointment.posMasterNoOld = org.result.posMasterNo;
placementAppointment.positionOld = org.result.position;
placementAppointment.posTypeOldId = org.result.posTypeId;
placementAppointment.posTypeNameOld = org.result.posTypeName;
placementAppointment.posLevelOldId = org.result.posLevelId;
placementAppointment.posLevelNameOld = org.result.posLevelName;
// placementAppointment.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}";
// placementAppointment.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount;
placementAppointment.PositionOld = org.result.position;
placementAppointment.PositionLevelOld = org.result.posLevelName;
placementAppointment.PositionTypeOld = org.result.posTypeName;
placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(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 + "/");
placementAppointment.OrganizationPositionOld = org.result.position + "-" + placementAppointment.OrganizationOld;
}
await _context.PlacementAppointments.AddAsync(placementAppointment);
await _context.SaveChangesAsync();
@ -434,13 +522,14 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.child4ShortName = req.node <= 3 ? null : org.result.child4ShortName;
}
uppdated.typeCommand = req.typeCommand == null ? null : req.typeCommand.Trim().ToUpper();
uppdated.posmasterId = req.posmasterId;
uppdated.node = req.node;
uppdated.nodeId = req.nodeId;
uppdated.orgRevisionId = req.orgRevisionId;
uppdated.positionId = req.positionId;
uppdated.posMasterNo = req.posMasterNo;
uppdated.positionName = req.positionName;
uppdated.position = req.position;
uppdated.positionField = req.positionField;
uppdated.posTypeId = req.posTypeId;
uppdated.posTypeName = req.posTypeName;
@ -448,6 +537,7 @@ namespace BMA.EHR.Placement.Service.Controllers
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 ?? "";
@ -546,7 +636,7 @@ namespace BMA.EHR.Placement.Service.Controllers
if (uppdated == null)
continue;
uppdated.CommandType = await _context.CommandTypes.FindAsync(commandTypeId);
// uppdated.CommandType = await _context.CommandTypes.FindAsync(commandTypeId);
uppdated.Status = "REPORT";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
uppdated.LastUpdateUserId = UserId ?? "";

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

@ -170,6 +170,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.DateEnd,
p.Organization,
p.OrganizationPositionOld,
p.PositionOld,
p.OrganizationOld,
p.IsActive,
})
.FirstOrDefaultAsync();
@ -241,6 +243,17 @@ namespace BMA.EHR.Placement.Service.Controllers
placementOfficer.posTypeName = org.result.posTypeName;
placementOfficer.posLevelId = org.result.posLevelId;
placementOfficer.posLevelName = org.result.posLevelName;
placementOfficer.PositionOld = org.result.position;
placementOfficer.PositionLevelOld = org.result.posLevelName;
placementOfficer.PositionTypeOld = org.result.posTypeName;
placementOfficer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementOfficer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(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 + "/");
placementOfficer.OrganizationPositionOld = org.result.position + "-" + placementOfficer.OrganizationOld;
}
await _context.PlacementOfficers.AddAsync(placementOfficer);
await _context.SaveChangesAsync();
@ -265,6 +278,7 @@ namespace BMA.EHR.Placement.Service.Controllers
return Error(GlobalMessages.PlacementOfficerNotFound, 404);
uppdated.PositionNumberOld = req.PositionNumberOld;
uppdated.PositionOld = req.PositionOld;
uppdated.OrganizationPositionOld = req.OrganizationPositionOld;
uppdated.PositionLevelOld = req.PositionLevelOld;
uppdated.PositionTypeOld = req.PositionTypeOld;

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

@ -67,84 +67,105 @@ namespace BMA.EHR.Placement.Service.Controllers
[HttpGet()]
public async Task<ActionResult<ResponseObject>> GetListByAdmin()
{
var rootId = "";
var child1Id = "";
var child2Id = "";
var child3Id = "";
var child4Id = "";
var apiUrl = $"{_configuration["API"]}org/profile/keycloak/position";
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
// var rootId = "";
// var child1Id = "";
// var child2Id = "";
// var child3Id = "";
// var child4Id = "";
// var apiUrl = $"{_configuration["API"]}org/profile/keycloak/position";
// using (var client = new HttpClient())
// {
// client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
// var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
// var _res = await client.SendAsync(_req);
// var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
// var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
if (org == null || org.result == null)
return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
rootId = org.result.rootId == null ? "" : org.result.rootId;
child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
// if (org == null || org.result == null)
// return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
// rootId = org.result.rootId == null ? "" : org.result.rootId;
// child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
// child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
// child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
// child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
var placementReceives = await _context.PlacementReceives.AsQueryable()
var placementReceives = await _context.PlacementReceives.AsQueryable()
.OrderByDescending(x => x.CreatedAt)
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
.Select(p => new
{
p.Id,
p.citizenId,
p.prefix,
p.firstName,
p.lastName,
p.DateOfBirth,
Gender = p.Gender == null ? null : p.Gender.Name,
p.Status,
p.Amount,
p.RecruitDate,
p.root,
p.rootId,
p.rootShortName,
p.child1,
p.child1Id,
p.child1ShortName,
p.child2,
p.child2Id,
p.child2ShortName,
p.child3,
p.child3Id,
p.child3ShortName,
p.child4,
p.child4Id,
p.child4ShortName,
p.orgRevisionId,
p.positionId,
p.posMasterNo,
p.positionName,
p.positionField,
p.posTypeId,
p.posTypeName,
p.posLevelId,
p.posLevelName,
p.IsActive,
p.Reason,
p.EducationOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.CreatedAt,
})
.ToListAsync();
// if (PlacementAdmin == true)
// placementReceives.Where(x => x.Status.Trim().ToUpper().Contains("PENDING"));
// .Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
.Select(p => new
{
p.Id,
p.prefix,
p.firstName,
p.lastName,
p.citizenId,
p.Status,
p.RecruitDate,
p.root,
p.rootId,
p.rootShortName,
p.child1,
p.child1Id,
p.child1ShortName,
p.child2,
p.child2Id,
p.child2ShortName,
p.child3,
p.child3Id,
p.child3ShortName,
p.child4,
p.child4Id,
p.child4ShortName,
p.orgRevisionId,
p.positionId,
p.posMasterNo,
p.position,
p.positionField,
p.posTypeId,
p.posTypeName,
p.posLevelId,
p.posLevelName,
return Success(placementReceives);
}
p.IsActive,
p.Reason,
p.EducationOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.OrganizationOld,
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.positionOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
p.posLevelNameOld,
p.CreatedAt,
})
.ToListAsync();
// if (PlacementAdmin == true)
// placementReceives.Where(x => x.Status.Trim().ToUpper().Contains("PENDING"));
return Success(placementReceives);
// }
}
/// <summary>
@ -198,20 +219,46 @@ namespace BMA.EHR.Placement.Service.Controllers
p.orgRevisionId,
p.positionId,
p.posMasterNo,
p.positionName,
p.position,
p.positionField,
p.posTypeId,
p.posTypeName,
p.posLevelId,
p.posLevelName,
p.CreatedAt,
p.Reason,
p.EducationOld,
p.AmountOld,
p.PositionOld,
p.OrganizationOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.IsActive,
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,
// Avatar = p.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Avatar.Id,
PlacementReceiveDocs = p.PlacementReceiveDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
@ -263,23 +310,53 @@ namespace BMA.EHR.Placement.Service.Controllers
data.child4,
data.child4Id,
data.child4ShortName,
node = data.root == null ? (int?)null : (data.child1 == null ? 0 : (data.child2 == null ? 1 : (data.child3 == null ? 2 : (data.child4 == null ? 3 : 4)))),
nodeName = data.root == null ? null : (data.child1 == null ? data.root : (data.child2 == null ? data.child1 : (data.child3 == null ? data.child2 : (data.child4 == null ? data.child3 : data.child4)))),
nodeId = data.rootId == null ? null : (data.child1Id == null ? data.rootId : (data.child2Id == null ? data.child1Id : (data.child3Id == null ? data.child2Id : (data.child4Id == null ? data.child3Id : data.child4Id)))),
nodeShortName = data.rootShortName == null ? null : (data.child1ShortName == null ? data.rootShortName : (data.child2ShortName == null ? data.child1ShortName : (data.child3ShortName == null ? data.child2ShortName : (data.child4ShortName == null ? data.child3ShortName : data.child4ShortName)))),
data.orgRevisionId,
data.positionId,
data.posMasterNo,
data.positionName,
data.position,
data.positionField,
data.posTypeId,
data.posTypeName,
data.posLevelId,
data.posLevelName,
data.CreatedAt,
data.Reason,
data.EducationOld,
data.AmountOld,
data.PositionOld,
data.OrganizationOld,
data.PositionTypeOld,
data.PositionLevelOld,
data.PositionNumberOld,
data.OrganizationPositionOld,
data.IsActive,
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.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 = placementReceiveDocs,
};
@ -321,24 +398,60 @@ namespace BMA.EHR.Placement.Service.Controllers
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
};
// var profile = await _context.Profiles
// .Include(x => x.PositionLevel)
// .Include(x => x.PositionType)
// .Include(x => x.PosNo)
// .Include(x => x.Salaries)
// .Include(x => x.Educations)
// .Include(x => x.Position)
// .FirstOrDefaultAsync(x => x.CitizenId == req.CitizenId);
// if (profile != null)
// {
// placementReceive.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}";
// placementReceive.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount;
// placementReceive.PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name;
// placementReceive.PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name;
// placementReceive.PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name;
// placementReceive.OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}";
// }
var apiUrl = $"{_configuration["API"]}org/profile/citizenid/position/{req.citizenId}";
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
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.rootOld = org.result.root;
placementReceive.rootOldId = org.result.rootId;
placementReceive.rootShortNameOld = org.result.rootShortName;
placementReceive.child1Old = org.result.child1;
placementReceive.child1OldId = org.result.child1Id;
placementReceive.child1ShortNameOld = org.result.child1ShortName;
placementReceive.child2Old = org.result.child2;
placementReceive.child2OldId = org.result.child2Id;
placementReceive.child2ShortNameOld = org.result.child2ShortName;
placementReceive.child3Old = org.result.child3;
placementReceive.child3OldId = org.result.child3Id;
placementReceive.child3ShortNameOld = org.result.child3ShortName;
placementReceive.child4Old = org.result.child4;
placementReceive.child4OldId = org.result.child4Id;
placementReceive.child4ShortNameOld = org.result.child4ShortName;
placementReceive.posMasterNoOld = org.result.posMasterNo;
placementReceive.posTypeOldId = org.result.posTypeId;
placementReceive.posTypeNameOld = org.result.posTypeName;
placementReceive.posLevelOldId = org.result.posLevelId;
placementReceive.posLevelNameOld = org.result.posLevelName;
// placementReceive.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}";
// placementReceive.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount;
placementReceive.PositionOld = org.result.position;
placementReceive.PositionLevelOld = org.result.posLevelName;
placementReceive.PositionTypeOld = org.result.posTypeName;
placementReceive.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementReceive.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(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 + "/");
placementReceive.OrganizationPositionOld = org.result.position + "-" + placementReceive.OrganizationOld;
}
}
await _context.PlacementReceives.AddAsync(placementReceive);
await _context.SaveChangesAsync();
if (Request.Form.Files != null && Request.Form.Files.Count != 0)
@ -478,7 +591,7 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.orgRevisionId = req.orgRevisionId;
uppdated.positionId = req.positionId;
uppdated.posMasterNo = req.posMasterNo;
uppdated.positionName = req.positionName;
uppdated.position = req.position;
uppdated.positionField = req.positionField;
uppdated.posTypeId = req.posTypeId;
uppdated.posTypeName = req.posTypeName;

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

@ -178,6 +178,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.DateRepatriation,
})
.FirstOrDefaultAsync();
@ -249,6 +250,17 @@ namespace BMA.EHR.Placement.Service.Controllers
placementRepatriation.posTypeName = org.result.posTypeName;
placementRepatriation.posLevelId = org.result.posLevelId;
placementRepatriation.posLevelName = org.result.posLevelName;
placementRepatriation.PositionOld = org.result.position;
placementRepatriation.PositionLevelOld = org.result.posLevelName;
placementRepatriation.PositionTypeOld = org.result.posTypeName;
placementRepatriation.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementRepatriation.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(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 + "/");
placementRepatriation.OrganizationPositionOld = org.result.position + "-" + placementRepatriation.OrganizationOld;
}
await _context.PlacementRepatriations.AddAsync(placementRepatriation);
await _context.SaveChangesAsync();

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

@ -14,6 +14,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? firstName { get; set; }
public string? lastName { get; set; }
public string? citizenId { get; set; }
public DateTime? birthDate { get; set; }
public string? root { get; set; }
public string? rootId { get; set; }
public string? rootShortName { get; set; }
@ -29,6 +30,9 @@ namespace BMA.EHR.Placement.Service.Requests
public string? child4 { get; set; }
public string? child4Id { get; set; }
public string? child4ShortName { get; set; }
public string? node { get; set; }
public string? nodeId { get; set; }
public string? nodeShortName { get; set; }
public int? posMasterNo { get; set; }
public string? position { get; set; }
public string? posTypeId { get; set; }

2
BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentEmployeeRequest.cs
View file

@ -22,7 +22,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? orgRevisionId { get; set; }
public int? posMasterNo { get; set; }
public string? positionId { get; set; }
public string? positionName { get; set; }
public string? position { get; set; }
public string? positionField { get; set; }
public string? posTypeId { get; set; }
public string? posTypeName { get; set; }

2
BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs
View file

@ -22,7 +22,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? orgRevisionId { get; set; }
public int? posMasterNo { get; set; }
public string? positionId { get; set; }
public string? positionName { get; set; }
public string? position { get; set; }
public string? positionField { get; set; }
public string? posTypeId { get; set; }
public string? posTypeName { get; set; }

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

@ -22,7 +22,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? orgRevisionId { get; set; }
public int? posMasterNo { get; set; }
public string? positionId { get; set; }
public string? positionName { get; set; }
public string? position { get; set; }
public string? positionField { get; set; }
public string? posTypeId { get; set; }
public string? posTypeName { get; set; }

24
BMA.EHR.Placement.Service/Requests/PlacementAppointmentEditRequest.cs
View file

@ -5,18 +5,18 @@ namespace BMA.EHR.Placement.Service.Requests
{
public class PlacementAppointmentEditRequest
{
public string CitizenId { get; set; }
public Guid PrefixId { get; set; }
public string Firstname { get; set; }
public string Lastname { get; set; }
public DateTime DateOfBirth { get; set; }
public Guid? GenderId { get; set; }
public string? Nationality { get; set; }
public string? Race { get; set; }
public Guid? ReligionId { get; set; }
public Guid? BloodGroupId { get; set; }
public Guid? RelationshipId { get; set; }
public string? TelephoneNumber { get; set; }
// public string CitizenId { get; set; }
// public Guid PrefixId { get; set; }
// public string Firstname { get; set; }
// public string Lastname { get; set; }
// public DateTime DateOfBirth { get; set; }
// public Guid? GenderId { get; set; }
// public string? Nationality { get; set; }
// public string? Race { get; set; }
// public Guid? ReligionId { get; set; }
// public Guid? BloodGroupId { get; set; }
// public Guid? RelationshipId { get; set; }
// public string? TelephoneNumber { get; set; }
public string? Reason { get; set; }
public string? EducationOld { get; set; }
public string? OrganizationPositionOld { get; set; }

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

@ -8,6 +8,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string Organization { get; set; }
public string Reason { get; set; }
public string? OrganizationPositionOld { get; set; }
public string? PositionOld { get; set; }
public DateTime? DateStart { get; set; }
public DateTime? DateEnd { get; set; }
public string? PositionTypeOld { get; set; }

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

@ -392,7 +392,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
IsSendInbox = true,
IsSendNotification = true,
// OrganizationName = retirementDeceased.OrganizationName,
// PositionName = retirementDeceased.PositionName,
PositionName = retirementDeceased.position,
// ReceiveUser = profile,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -502,7 +502,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsSendNotification,
p.OrganizationName,
p.PositionName,
ProfileId = p.ReceiveUser.Id,
// ProfileId = p.ReceiveUser.Id,
})
.ToListAsync();
@ -547,7 +547,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
IsSendNotification = item.IsSendNotification,
OrganizationName = profile.OrganizationOrganization == null ? "" : profile.OrganizationOrganization,
PositionName = profile.Position == null ? null : profile.Position.Name,
ReceiveUser = profile,
// ReceiveUser = profile,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
@ -595,7 +595,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
public async Task<ActionResult<ResponseObject>> NotiDeceased([FromBody] RetirementDeceasedAddNotiPersonRequest req, Guid id)
{
var items = await _context.RetirementDeceasedNotis.AsQueryable()
.Include(x => x.ReceiveUser)
// .Include(x => x.ReceiveUser)
.Include(x => x.RetirementDeceased)
// .ThenInclude(x => x.Profile)
// .ThenInclude(x => x.Prefix)
@ -625,36 +625,36 @@ namespace BMA.EHR.Retirement.Service.Controllers
};
var payload_str = JsonConvert.SerializeObject(payload);
foreach (var item in items)
{
var prefix = item.RetirementDeceased.prefix;
var profile = req.Persons.FirstOrDefault(x => x.ProfileId == item.ReceiveUser.Id);
if (profile != null)
{
await _repositoryNoti.PushNotificationAsync(
item.ReceiveUser.Id,
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
payload_str,
profile.IsSendInbox,
profile.IsSendMail
);
item.IsSendMail = profile.IsSendMail;
item.IsSendInbox = profile.IsSendInbox;
item.IsSendNotification = profile.IsSendNotification;
}
else
{
await _repositoryNoti.PushNotificationAsync(
item.ReceiveUser.Id,
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
payload_str,
item.IsSendInbox,
item.IsSendMail
);
}
}
// foreach (var item in items)
// {
// var prefix = item.RetirementDeceased.prefix;
// var profile = req.Persons.FirstOrDefault(x => x.ProfileId == item.ReceiveUser.Id);
// if (profile != null)
// {
// await _repositoryNoti.PushNotificationAsync(
// item.ReceiveUser.Id,
// $"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// $"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// payload_str,
// profile.IsSendInbox,
// profile.IsSendMail
// );
// item.IsSendMail = profile.IsSendMail;
// item.IsSendInbox = profile.IsSendInbox;
// item.IsSendNotification = profile.IsSendNotification;
// }
// else
// {
// await _repositoryNoti.PushNotificationAsync(
// item.ReceiveUser.Id,
// $"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// $"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// payload_str,
// item.IsSendInbox,
// item.IsSendMail
// );
// }
// }
await _context.SaveChangesAsync();
return Success();

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

@ -178,6 +178,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.OrganizationOld,
p.PositionDate,
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
// RetirementOtherDocs = p.RetirementOtherDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
@ -328,6 +330,17 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.posTypeName = org.result.posTypeName;
retirementOther.posLevelId = org.result.posLevelId;
retirementOther.posLevelName = org.result.posLevelName;
retirementOther.PositionOld = org.result.position;
retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName;
retirementOther.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementOther.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(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 + "/");
retirementOther.OrganizationPositionOld = org.result.position + "-" + retirementOther.OrganizationOld;
}
await _context.RetirementOthers.AddAsync(retirementOther);
await _context.SaveChangesAsync();

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

@ -177,6 +177,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.OrganizationOld,
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
})
.FirstOrDefaultAsync();
@ -289,6 +291,17 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOut.posTypeName = org.result.posTypeName;
retirementOut.posLevelId = org.result.posLevelId;
retirementOut.posLevelName = org.result.posLevelName;
retirementOut.PositionOld = org.result.position;
retirementOut.PositionLevelOld = org.result.posLevelName;
retirementOut.PositionTypeOld = org.result.posTypeName;
retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(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 + "/");
retirementOut.OrganizationPositionOld = org.result.position + "-" + retirementOut.OrganizationOld;
}
await _context.RetirementOuts.AddAsync(retirementOut);
await _context.SaveChangesAsync();

6
BMA.EHR.Retirement.Service/Program.cs
View file

@ -160,9 +160,9 @@ var app = builder.Build();
var manager = new RecurringJobManager();
if (manager != null)
{
manager.AddOrUpdate("แจ้งเตือนระบบปลดออก", Job.FromExpression<RetirementRepository>(x => x.NotifyDischarge()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
manager.AddOrUpdate("แจ้งเตือนระบบไล่ออก", Job.FromExpression<RetirementRepository>(x => x.NotifyExpulsion()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
manager.AddOrUpdate("แจ้งเตือนระบบให้ออก", Job.FromExpression<RetirementRepository>(x => x.NotifyOut()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
//manager.AddOrUpdate("แจ้งเตือนระบบปลดออก", Job.FromExpression<RetirementRepository>(x => x.NotifyDischarge()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
//manager.AddOrUpdate("แจ้งเตือนระบบไล่ออก", Job.FromExpression<RetirementRepository>(x => x.NotifyExpulsion()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
//manager.AddOrUpdate("แจ้งเตือนระบบให้ออก", Job.FromExpression<RetirementRepository>(x => x.NotifyOut()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
}
// apply migrations

3
BMA.EHR.Retirement.Service/Requests/OrgRequest.cs
View file

@ -29,6 +29,9 @@ namespace BMA.EHR.Retirement.Service.Requests
public string? child4 { get; set; }
public string? child4Id { get; set; }
public string? child4ShortName { get; set; }
public string? node { get; set; }
public string? nodeId { get; set; }
public string? nodeShortName { get; set; }
public int? posMasterNo { get; set; }
public string? position { get; set; }
public string? posTypeId { get; set; }

4
BMA.EHR.Retirement.Service/appsettings.json
View file

@ -15,7 +15,7 @@
"ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
// "DefaultConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
"DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
},
"Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
@ -33,6 +33,6 @@
"BucketName": "bma-recruit"
},
"Protocol": "HTTPS",
"API": "https://bma-ehr.frappet.synology.me/api/v1",
"API": "https://bma-ehr.frappet.synology.me/api/v1/",
"APIV2": "https://bma-ehr.frappet.synology.me/api/v2"
}