From 68fbe0500709efac7b1276a23dbf52d93293bc74 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 12 Jun 2024 17:32:42 +0700
Subject: [PATCH 1/3] no message

---
 src/entities/ProfileChangePosition.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/entities/ProfileChangePosition.ts b/src/entities/ProfileChangePosition.ts
index 1ffac9e1..0b495562 100644
--- a/src/entities/ProfileChangePosition.ts
+++ b/src/entities/ProfileChangePosition.ts
@@ -47,6 +47,9 @@ export class ProfileChangePosition extends EntityBase {
   @Column({ nullable: true, comment: "เลขบัตรประชาชน", default: null })
   citizenId: string;
 
+  @Column({ nullable: true, type: "datetime", comment: "วันเกิด", default: null })
+  birthDate: Date;
+
   @Column({ nullable: true, comment: "ชื่อหน่วยงาน root", default: null })
   root: string;
 
@@ -201,6 +204,7 @@ export class ProfileChangePosition extends EntityBase {
   profile: ChangePosition;
 }
 
+//เพิ่มรายชื่อผู้ที่ย้ายสับเปลี่ยนตำแหน่ง
 export class CreateProfileChangePosition {
   changePositionId: string;
   profiles: ProfileItem[]
@@ -241,3 +245,19 @@ export class ProfileItem {
   posLevelOldId: string | null;
   posLevelNameOld: string | null;
 }
+
+//เลือกหน่วยงานที่รับย้าย
+export type UpdateProfileChangePosition = {
+  posmasterId: string;
+  node: number;
+  nodeId: string;
+  orgRevisionId: string;
+  positionId: string;
+  posMasterNo: number;
+  position: string;
+  positionField: string;
+  posTypeId: string | null;
+  posTypeName: string;
+  posLevelId: string | null;
+  posLevelName: string;
+};
\ No newline at end of file

From c06775634acd9ed361ef9cc653176d8522704b45 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 12 Jun 2024 17:38:58 +0700
Subject: [PATCH 2/3] migrate

---
 ...2070-update_table_profilechage_add_birthdate.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/migration/1718188662070-update_table_profilechage_add_birthdate.ts

diff --git a/src/migration/1718188662070-update_table_profilechage_add_birthdate.ts b/src/migration/1718188662070-update_table_profilechage_add_birthdate.ts
new file mode 100644
index 00000000..545d13c6
--- /dev/null
+++ b/src/migration/1718188662070-update_table_profilechage_add_birthdate.ts
@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateTableProfilechageAddBirthdate1718188662070 implements MigrationInterface {
+    name = 'UpdateTableProfilechageAddBirthdate1718188662070'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`profileChangePosition\` ADD \`birthDate\` datetime NULL COMMENT 'วันเกิด'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`profileChangePosition\` DROP COLUMN \`birthDate\``);
+    }
+
+}

From ec5605be5590866a1d581b2dbe00f815e8488fc3 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 12 Jun 2024 17:44:19 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20isProbation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ProfileController.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 3f304e2c..b7d88f91 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -1493,6 +1493,7 @@ export class ProfileController extends Controller {
       prefix: profile.prefix,
       rank: profile.rank,
       avatar: profile.avatar,
+      isProbation: profile.isProbation,
       avatarName: profile.avatarName,
       firstName: profile.firstName,
       lastName: profile.lastName,