diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 48768a79..d4e5e238 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -2941,6 +2941,8 @@ export class CommandController extends Controller { positionSalaryAmount?: Double | null; mouthSalaryAmount?: Double | null; positionExecutive: string | null; + positionExecutiveField?: string | null; + positionArea?: string | null; positionType: string | null; positionLevel: string | null; posmasterId: string; @@ -3771,6 +3773,8 @@ export class CommandController extends Controller { positionSalaryAmount?: Double | null; mouthSalaryAmount?: Double | null; positionExecutive: string | null; + positionExecutiveField?: string | null; + positionArea?: string | null; positionType: string | null; positionLevel: string | null; commandId?: string | null; diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index e73837c2..3bd2ccd9 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -6847,6 +6847,14 @@ export class ProfileController extends Controller { position == null || position.posExecutive == null ? null : position.posExecutive.posExecutiveName, + positionExecutiveField: + position == null || position.positionExecutiveField == null + ? null + : position.positionExecutiveField, + positionArea: + position == null || position.positionArea == null + ? null + : position.positionArea, posExecutivePriority: position == null || position.posExecutive == null ? null @@ -7005,6 +7013,14 @@ export class ProfileController extends Controller { position == null || position.posExecutive == null ? null : position.posExecutive.posExecutiveName, + positionExecutiveField: + position == null || position.positionExecutiveField == null + ? null + : position.positionExecutiveField, + positionArea: + position == null || position.positionArea == null + ? null + : position.positionArea, posExecutivePriority: position == null || position.posExecutive == null ? null @@ -7811,6 +7827,14 @@ export class ProfileController extends Controller { position == null || position.posExecutive == null ? null : position.posExecutive.posExecutiveName, + positionExecutiveField: + position == null || position.positionExecutiveField == null + ? null + : position.positionExecutiveField, + positionArea: + position == null || position.positionArea == null + ? null + : position.positionArea, rootId: root == null ? null : root.id, rootDnaId: root == null ? null : root.ancestorDNA, root: root == null ? null : root.orgRootName, @@ -8003,6 +8027,14 @@ export class ProfileController extends Controller { position == null || position.posExecutive == null ? null : position.posExecutive.posExecutiveName, + positionExecutiveField: + position == null || position.positionExecutiveField == null + ? null + : position.positionExecutiveField, + positionArea: + position == null || position.positionArea == null + ? null + : position.positionArea, orgRevisionId: root == null ? null : root.orgRevisionId, rootId: root == null ? null : root.id, rootDnaId: root == null ? null : root.ancestorDNA, diff --git a/src/entities/ProfileSalary.ts b/src/entities/ProfileSalary.ts index 92cb8d0d..ec71c039 100644 --- a/src/entities/ProfileSalary.ts +++ b/src/entities/ProfileSalary.ts @@ -271,6 +271,22 @@ export class ProfileSalary extends EntityBase { }) posNumCodeSitAbb: string; + @Column({ + nullable: true, + length: 255, + comment: "ด้านทางการบริหาร", + default: null, + }) + positionExecutiveField: string; + + @Column({ + nullable: true, + length: 255, + comment: "ด้าน/สาขา", + default: null, + }) + positionArea: string; + @ManyToOne(() => Command, (command) => command.profileSalarys) @JoinColumn({ name: "commandId" }) command: Command; @@ -305,6 +321,8 @@ export class CreateProfileSalary { positionLine?: string | null; positionPathSide?: string | null; positionExecutive?: string | null; + positionExecutiveField?: string | null; + positionArea?: string | null; amount?: Double | null; amountSpecial?: Double | null; positionSalaryAmount?: Double | null;