Merge branch 'develop' into adiDev

# Conflicts:
#	src/controllers/ReportController.ts

src/entities/HR_EDUCATION.ts

@@ -45,4 +45,11 @@ export class HR_EDUCATION {
     default: null,
   })
   INSTITUE: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  EDUCATION_SEQ: string;
 }

src/entities/IMPORT_ORG.ts

@@ -67,4 +67,25 @@ export class IMPORT_ORG {
     default: null,
   })
   MISCODE: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  orgShortname: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  orgRank: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  orgSubRank: string;
 }

src/entities/OFFICER.ts

@@ -0,0 +1,133 @@
+import { Entity, Column, PrimaryGeneratedColumn } from "typeorm";
+
+@Entity("OFFICER")
+export class OFFICER {
+  @PrimaryGeneratedColumn()
+  id!: number;
+
+  //   @Column({
+  //     nullable: true,
+  //     type: "text",
+  //     default: null,
+  //   })
+  //   RET_YEAR: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  ID: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  MP_CATEGORY: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  MP_LEVEL: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  BORN: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  RANK_NAME: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  FNAME: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  LNAME: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  BEGIN_ENTRY_DATE: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  SEX: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  WORK_LINE_NAME: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  SALARY: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  DEPARTMENT_NAME: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  DIVISION_NAME: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  SECTION_NAME: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  JOB_NAME: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  POS_NUM_CODE: string;
+
+  @Column({
+    nullable: true,
+    type: "text",
+    default: null,
+  })
+  POS_NUM_NAME: string;
+}