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

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source
This commit is contained in:
mamoss 2025-11-03 16:15:33 +07:00
commit 2094973dd0
5 changed files with 56 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/controllers/OrganizationController.ts
View file

@ -1218,6 +1218,7 @@ export class OrganizationController extends Controller {
"orgRoot.SECTION_CODE",
"orgRoot.JOB_CODE",
"orgRoot.responsibility",
"orgRoot.ancestorDNA",
])
.orderBy("orgRoot.orgRootOrder", "ASC")
.getMany();
@ -1246,6 +1247,7 @@ export class OrganizationController extends Controller {
"orgChild1.SECTION_CODE",
"orgChild1.JOB_CODE",
"orgChild1.responsibility",
"orgChild1.ancestorDNA",
])
.orderBy("orgChild1.orgChild1Order", "ASC")
.getMany()
@ -1275,6 +1277,7 @@ export class OrganizationController extends Controller {
"orgChild2.JOB_CODE",
"orgChild2.orgChild1Id",
"orgChild2.responsibility",
"orgChild2.ancestorDNA",
])
.orderBy("orgChild2.orgChild2Order", "ASC")
.getMany()
@ -1304,6 +1307,7 @@ export class OrganizationController extends Controller {
"orgChild3.JOB_CODE",
"orgChild3.orgChild2Id",
"orgChild3.responsibility",
"orgChild3.ancestorDNA",
])
.orderBy("orgChild3.orgChild3Order", "ASC")
.getMany()
@ -1333,6 +1337,7 @@ export class OrganizationController extends Controller {
"orgChild4.JOB_CODE",
"orgChild4.orgChild3Id",
"orgChild4.responsibility",
"orgChild4.ancestorDNA",
])
.orderBy("orgChild4.orgChild4Order", "ASC")
.getMany()
@ -1351,6 +1356,7 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + "00",
orgTreeRank: orgRoot.orgRootRank,
orgTreeRankSub: orgRoot.orgRootRankSub,
orgRootDnaId: orgRoot.ancestorDNA,
DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE,
DIVISION_CODE: orgRoot.DIVISION_CODE,
SECTION_CODE: orgRoot.SECTION_CODE,
@ -1466,6 +1472,8 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
orgTreeRank: orgChild1.orgChild1Rank,
orgTreeRankSub: orgChild1.orgChild1RankSub,
orgRootDnaId: orgRoot.ancestorDNA,
orgChild1DnaId: orgChild1.ancestorDNA,
DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE,
DIVISION_CODE: orgChild1.DIVISION_CODE,
SECTION_CODE: orgChild1.SECTION_CODE,
@ -1587,6 +1595,9 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
orgTreeRank: orgChild2.orgChild2Rank,
orgTreeRankSub: orgChild2.orgChild2RankSub,
orgRootDnaId: orgRoot.ancestorDNA,
orgChild1DnaId: orgChild1.ancestorDNA,
orgChild2DnaId: orgChild2.ancestorDNA,
DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE,
DIVISION_CODE: orgChild2.DIVISION_CODE,
SECTION_CODE: orgChild2.SECTION_CODE,
@ -1709,6 +1720,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
orgTreeRank: orgChild3.orgChild3Rank,
orgTreeRankSub: orgChild3.orgChild3RankSub,
orgRootDnaId: orgRoot.ancestorDNA,
orgChild1DnaId: orgChild1.ancestorDNA,
orgChild2DnaId: orgChild2.ancestorDNA,
orgChild3DnaId: orgChild3.ancestorDNA,
DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE,
DIVISION_CODE: orgChild3.DIVISION_CODE,
SECTION_CODE: orgChild3.SECTION_CODE,
@ -1831,6 +1846,11 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
orgTreeRank: orgChild4.orgChild4Rank,
orgTreeRankSub: orgChild4.orgChild4RankSub,
orgRootDnaId: orgRoot.ancestorDNA,
orgChild1DnaId: orgChild1.ancestorDNA,
orgChild2DnaId: orgChild2.ancestorDNA,
orgChild3DnaId: orgChild3.ancestorDNA,
orgChild4DnaId: orgChild4.ancestorDNA,
DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE,
DIVISION_CODE: orgChild4.DIVISION_CODE,
SECTION_CODE: orgChild4.SECTION_CODE,

2
src/entities/ApiKey.ts
View file

@ -14,9 +14,9 @@ export class ApiKey extends EntityBase {
name: string;
@Column({
type: 'longtext',
nullable: true,
comment: "keyApi",
length: 255,
default: null,
})
keyApi: string;

4
src/entities/ProfileTraining.ts
View file

@ -55,9 +55,9 @@ export class ProfileTraining extends EntityBase {
topic: string;
@Column({
type: 'longtext',
nullable: true,
length: 200,
comment: "สถานที่ฝึกอบรม/ดูงาน ",
comment: "สถานที่ฝึกอบรม/ดูงาน",
default: null,
})
place: string;

17
src/migration/1762159481993-update_size_keyapi_field.ts Normal file
View file

@ -0,0 +1,17 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateSizeKeyapiField1762159481993 implements MigrationInterface {
name = 'UpdateSizeKeyapiField1762159481993'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`apiKey\` DROP COLUMN \`keyApi\``);
await queryRunner.query(`ALTER TABLE \`apiKey\` ADD \`keyApi\` longtext NULL COMMENT 'keyApi'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`apiKey\` DROP COLUMN \`keyApi\``);
await queryRunner.query(`ALTER TABLE \`apiKey\` ADD \`keyApi\` varchar(255) NULL COMMENT 'keyApi'`);
}
}

16
src/migration/1762159824907-update_size_place_field.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateSizePlaceField1762159824907 implements MigrationInterface {
name = 'UpdateSizePlaceField1762159824907'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`profileTraining\` DROP COLUMN \`place\``);
await queryRunner.query(`ALTER TABLE \`profileTraining\` ADD \`place\` longtext NULL COMMENT 'สถานที่ฝึกอบรม/ดูงาน'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`profileTraining\` DROP COLUMN \`place\``);
await queryRunner.query(`ALTER TABLE \`profileTraining\` ADD \`place\` varchar(200) NULL COMMENT 'สถานที่ฝึกอบรม/ดูงาน '`);
}
}