Merge branch 'develop' into adiDev

src/controllers/ProfileController.ts

@@ -1494,6 +1494,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,

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;
+};

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\``);
+    }
+
+}