hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'dev' into adiDev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m7s
Details

Browse source
This commit is contained in:
Adisak 2026-06-15 18:27:20 +07:00
commit 6319f7206a
11 changed files with 102 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/OrgChild1Controller.ts
View file

@ -74,6 +74,7 @@ export class OrgChild1Controller {
DIVISION_CODE: orgChild1.DIVISION_CODE,
SECTION_CODE: orgChild1.SECTION_CODE,
JOB_CODE: orgChild1.JOB_CODE,
CHILD1_CODE: orgChild1.CHILD1_CODE,
orgCode: orgChild1.orgRoot.orgRootCode + orgChild1.orgChild1Code,
};
return new HttpSuccess(getOrgChild1);
@ -346,6 +347,7 @@ export class OrgChild1Controller {
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
CHILD1_CODE: requestBody.CHILD1_CODE != null ? requestBody.CHILD1_CODE : _null,
isOfficer: requestBody.isOfficer,
isInformation: requestBody.isInformation,
orgChild1PhoneEx: requestBody.orgChild1PhoneEx,

2
src/controllers/OrgChild2Controller.ts
View file

@ -85,6 +85,7 @@ export class OrgChild2Controller extends Controller {
DIVISION_CODE: orgChild2.DIVISION_CODE,
SECTION_CODE: orgChild2.SECTION_CODE,
JOB_CODE: orgChild2.JOB_CODE,
CHILD2_CODE: orgChild2.CHILD2_CODE,
orgCode: orgChild2.orgRoot.orgRootCode + orgChild2.orgChild2Code,
};
return new HttpSuccess(getOrgChild2);
@ -252,6 +253,7 @@ export class OrgChild2Controller extends Controller {
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
CHILD2_CODE: requestBody.CHILD2_CODE != null ? requestBody.CHILD2_CODE : _null,
orgChild2PhoneEx: requestBody.orgChild2PhoneEx,
orgChild2PhoneIn: requestBody.orgChild2PhoneIn,
orgChild2Fax: requestBody.orgChild2Fax,

2
src/controllers/OrgChild3Controller.ts
View file

@ -69,6 +69,7 @@ export class OrgChild3Controller {
DIVISION_CODE: orgChild3.DIVISION_CODE,
SECTION_CODE: orgChild3.SECTION_CODE,
JOB_CODE: orgChild3.JOB_CODE,
CHILD3_CODE: orgChild3.CHILD3_CODE,
orgCode: orgChild3.orgRoot.orgRootCode + orgChild3.orgChild3Code,
};
return new HttpSuccess(getOrgChild3);
@ -207,6 +208,7 @@ export class OrgChild3Controller {
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
CHILD3_CODE: requestBody.CHILD3_CODE != null ? requestBody.CHILD3_CODE : _null,
orgChild3PhoneEx: requestBody.orgChild3PhoneEx,
orgChild3PhoneIn: requestBody.orgChild3PhoneIn,
orgChild3Fax: requestBody.orgChild3Fax,

2
src/controllers/OrgChild4Controller.ts
View file

@ -82,6 +82,7 @@ export class OrgChild4Controller extends Controller {
DIVISION_CODE: orgChild4.DIVISION_CODE,
SECTION_CODE: orgChild4.SECTION_CODE,
JOB_CODE: orgChild4.JOB_CODE,
CHILD4_CODE: orgChild4.CHILD4_CODE,
orgCode: orgChild4.orgRoot.orgRootCode + orgChild4.orgChild4Code,
};
return new HttpSuccess(getOrgChild4);
@ -254,6 +255,7 @@ export class OrgChild4Controller extends Controller {
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
CHILD4_CODE: requestBody.CHILD4_CODE != null ? requestBody.CHILD4_CODE : _null,
orgChild4PhoneEx: requestBody.orgChild4PhoneEx,
orgChild4PhoneIn: requestBody.orgChild4PhoneIn,
orgChild4Fax: requestBody.orgChild4Fax,

2
src/controllers/OrgRootController.ts
View file

@ -83,6 +83,7 @@ export class OrgRootController extends Controller {
DIVISION_CODE: orgRoot.DIVISION_CODE,
SECTION_CODE: orgRoot.SECTION_CODE,
JOB_CODE: orgRoot.JOB_CODE,
ROOT_CODE: orgRoot.ROOT_CODE,
orgCode: orgRoot.orgRootCode + "00",
};
return new HttpSuccess(getOrgRoot);
@ -350,6 +351,7 @@ export class OrgRootController extends Controller {
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
ROOT_CODE: requestBody.ROOT_CODE != null ? requestBody.ROOT_CODE : _null,
});
await this.orgRootRepository.save(orgRoot, { data: request });
setLogDataDiff(request, { before, after: orgRoot });

14
src/entities/OrgChild1.ts
View file

@ -174,6 +174,14 @@ export class OrgChild1 extends EntityBase {
})
JOB_CODE: string;
@Column({
nullable: true,
length: 3,
comment: "CHILD1_CODE",
default: null,
})
CHILD1_CODE: string;
@ManyToOne(() => OrgRoot, (orgRoot) => orgRoot.orgChild1s)
@JoinColumn({ name: "orgRootId" })
orgRoot: OrgRoot;
@ -228,6 +236,9 @@ export class CreateOrgChild1 {
@Column()
JOB_CODE?: string | null;
@Column()
CHILD1_CODE?: string | null;
@Column()
orgChild1PhoneEx?: string;
@ -283,6 +294,9 @@ export class UpdateOrgChild1 {
@Column()
JOB_CODE?: string | null;
@Column()
CHILD1_CODE?: string | null;
@Column()
orgChild1PhoneEx?: string;

14
src/entities/OrgChild2.ts
View file

@ -146,6 +146,14 @@ export class OrgChild2 extends EntityBase {
})
JOB_CODE: string;
@Column({
nullable: true,
length: 3,
comment: "CHILD2_CODE",
default: null,
})
CHILD2_CODE: string;
@Column({
nullable: true,
length: 40,
@ -222,6 +230,9 @@ export class CreateOrgChild2 {
@Column()
JOB_CODE?: string;
@Column()
CHILD2_CODE?: string;
@Column()
orgChild2PhoneEx?: string;
@ -269,6 +280,9 @@ export class UpdateOrgChild2 {
@Column()
JOB_CODE?: string | null;
@Column()
CHILD2_CODE?: string | null;
@Column()
orgChild2PhoneEx?: string;

14
src/entities/OrgChild3.ts
View file

@ -153,6 +153,14 @@ export class OrgChild3 extends EntityBase {
})
JOB_CODE: string;
@Column({
nullable: true,
length: 3,
comment: "CHILD3_CODE",
default: null,
})
CHILD3_CODE: string;
@Column({
nullable: true,
length: 40,
@ -230,6 +238,9 @@ export class CreateOrgChild3 {
@Column()
JOB_CODE?: string;
@Column()
CHILD3_CODE?: string;
@Column()
orgChild3PhoneEx?: string;
@ -279,6 +290,9 @@ export class UpdateOrgChild3 {
@Column()
JOB_CODE?: string | null;
@Column()
CHILD3_CODE?: string | null;
@Column()
orgChild3PhoneEx?: string;

14
src/entities/OrgChild4.ts
View file

@ -158,6 +158,14 @@ export class OrgChild4 extends EntityBase {
})
JOB_CODE: string;
@Column({
nullable: true,
length: 3,
comment: "CHILD4_CODE",
default: null,
})
CHILD4_CODE: string;
@Column({
nullable: true,
length: 40,
@ -236,6 +244,9 @@ export class CreateOrgChild4 {
@Column()
JOB_CODE?: string;
@Column()
CHILD4_CODE?: string;
@Column()
orgChild4PhoneEx?: string;
@ -283,6 +294,9 @@ export class UpdateOrgChild4 {
@Column()
JOB_CODE?: string | null;
@Column()
CHILD4_CODE?: string | null;
@Column()
orgChild4PhoneEx?: string;

14
src/entities/OrgRoot.ts
View file

@ -166,6 +166,14 @@ export class OrgRoot extends EntityBase {
})
JOB_CODE: string;
@Column({
nullable: true,
length: 3,
comment: "ROOT_CODE",
default: null,
})
ROOT_CODE: string;
@ManyToOne(() => OrgRevision, (orgRevision) => orgRevision.orgRoots)
@JoinColumn({ name: "orgRevisionId" })
orgRevision: OrgRevision;
@ -226,6 +234,9 @@ export class CreateOrgRoot {
@Column()
JOB_CODE?: string;
@Column()
ROOT_CODE?: string;
@Column()
orgRootPhoneEx?: string;
@ -281,6 +292,9 @@ export class UpdateOrgRoot {
@Column()
JOB_CODE?: string | null;
@Column()
ROOT_CODE?: string | null;
@Column()
orgRootPhoneEx?: string;

22
src/migration/1781517610929-update_root_c1_to_c4_add_field_code.ts Normal file
View file

@ -0,0 +1,22 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateRootC1ToC4AddFieldCode1781517610929 implements MigrationInterface {
name = 'UpdateRootC1ToC4AddFieldCode1781517610929'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`orgChild4\` ADD \`CHILD4_CODE\` varchar(3) NULL COMMENT 'CHILD4_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild3\` ADD \`CHILD3_CODE\` varchar(3) NULL COMMENT 'CHILD3_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild2\` ADD \`CHILD2_CODE\` varchar(3) NULL COMMENT 'CHILD2_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild1\` ADD \`CHILD1_CODE\` varchar(3) NULL COMMENT 'CHILD1_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgRoot\` ADD \`ROOT_CODE\` varchar(3) NULL COMMENT 'ROOT_CODE'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`orgRoot\` DROP COLUMN \`ROOT_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild1\` DROP COLUMN \`CHILD1_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild2\` DROP COLUMN \`CHILD2_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild3\` DROP COLUMN \`CHILD3_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild4\` DROP COLUMN \`CHILD4_CODE\``);
}
}