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

no message

Browse source
This commit is contained in:
Kittapath 2024-02-06 15:44:21 +07:00
parent 08f2c8753e
commit 1c55c76741
2 changed files with 87 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

94
src/controllers/ReportController.ts
View file

@ -207,11 +207,11 @@ export class ReportController extends Controller {
.map(async (posMaster) => { .map(async (posMaster) => {
let posMasterOld: any = null; let posMasterOld: any = null;
if (posMaster.next_holder != null) { if (posMaster.next_holder != null) {
posMasterOld = posMasterOlds.find((posMasOld) => // posMasterOld = posMasterOlds.find((posMasOld) =>
posMasOld.current_holder == null // posMasOld.current_holder == null
? false // ? false
: posMasOld.current_holder.id === posMaster.next_holder.id, // : posMasOld.current_holder.id === posMaster.next_holder.id,
); // );
} }
let positionOld: any = null; let positionOld: any = null;
if (posMasterOld != null) if (posMasterOld != null)
@ -222,10 +222,10 @@ export class ReportController extends Controller {
posMasterNoPrefix: posMaster.posMasterNoPrefix, posMasterNoPrefix: posMaster.posMasterNoPrefix,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
posMasterNoSuffix: posMaster.posMasterNoSuffix, posMasterNoSuffix: posMaster.posMasterNoSuffix,
profileFullname: // profileFullname:
posMaster.next_holder == null // posMaster.next_holder == null
? null // ? null
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, // : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
profilePosMasterNo: posMasterOld == null ? null : posMasterOld.posMasterNo, profilePosMasterNo: posMasterOld == null ? null : posMasterOld.posMasterNo,
profilePositionName: positionOld == null ? null : positionOld.positionName, profilePositionName: positionOld == null ? null : positionOld.positionName,
profilePosType: positionOld == null ? null : positionOld.posType.posTypeName, profilePosType: positionOld == null ? null : positionOld.posType.posTypeName,
@ -268,11 +268,11 @@ export class ReportController extends Controller {
.map(async (posMaster) => { .map(async (posMaster) => {
let posMasterOld: any = null; let posMasterOld: any = null;
if (posMaster.next_holder != null) { if (posMaster.next_holder != null) {
posMasterOld = posMasterOlds.find((posMasOld) => // posMasterOld = posMasterOlds.find((posMasOld) =>
posMasOld.current_holder == null // posMasOld.current_holder == null
? false // ? false
: posMasOld.current_holder.id === posMaster.next_holder.id, // : posMasOld.current_holder.id === posMaster.next_holder.id,
); // );
} }
let positionOld: any = null; let positionOld: any = null;
if (posMasterOld != null) if (posMasterOld != null)
@ -283,10 +283,10 @@ export class ReportController extends Controller {
posMasterNoPrefix: posMaster.posMasterNoPrefix, posMasterNoPrefix: posMaster.posMasterNoPrefix,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
posMasterNoSuffix: posMaster.posMasterNoSuffix, posMasterNoSuffix: posMaster.posMasterNoSuffix,
fullname: // fullname:
posMaster.next_holder == null // posMaster.next_holder == null
? null // ? null
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, // : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
profilePosMasterNo: profilePosMasterNo:
posMasterOld == null ? null : posMasterOld.posMasterNo, posMasterOld == null ? null : posMasterOld.posMasterNo,
profilePositionName: profilePositionName:
@ -335,11 +335,11 @@ export class ReportController extends Controller {
.map(async (posMaster) => { .map(async (posMaster) => {
let posMasterOld: any = null; let posMasterOld: any = null;
if (posMaster.next_holder != null) { if (posMaster.next_holder != null) {
posMasterOld = posMasterOlds.find((posMasOld) => // posMasterOld = posMasterOlds.find((posMasOld) =>
posMasOld.current_holder == null // posMasOld.current_holder == null
? false // ? false
: posMasOld.current_holder.id === posMaster.next_holder.id, // : posMasOld.current_holder.id === posMaster.next_holder.id,
); // );
} }
let positionOld: any = null; let positionOld: any = null;
if (posMasterOld != null) if (posMasterOld != null)
@ -350,10 +350,10 @@ export class ReportController extends Controller {
posMasterNoPrefix: posMaster.posMasterNoPrefix, posMasterNoPrefix: posMaster.posMasterNoPrefix,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
posMasterNoSuffix: posMaster.posMasterNoSuffix, posMasterNoSuffix: posMaster.posMasterNoSuffix,
fullname: // fullname:
posMaster.next_holder == null // posMaster.next_holder == null
? null // ? null
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, // : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
profilePosMasterNo: profilePosMasterNo:
posMasterOld == null ? null : posMasterOld.posMasterNo, posMasterOld == null ? null : posMasterOld.posMasterNo,
profilePositionName: profilePositionName:
@ -404,12 +404,12 @@ export class ReportController extends Controller {
.map(async (posMaster) => { .map(async (posMaster) => {
let posMasterOld: any = null; let posMasterOld: any = null;
if (posMaster.next_holder != null) { if (posMaster.next_holder != null) {
posMasterOld = posMasterOlds.find((posMasOld) => // posMasterOld = posMasterOlds.find((posMasOld) =>
posMasOld.current_holder == null // posMasOld.current_holder == null
? false // ? false
: posMasOld.current_holder.id === // : posMasOld.current_holder.id ===
posMaster.next_holder.id, // posMaster.next_holder.id,
); // );
} }
let positionOld: any = null; let positionOld: any = null;
if (posMasterOld != null) if (posMasterOld != null)
@ -421,10 +421,10 @@ export class ReportController extends Controller {
posMasterNoPrefix: posMaster.posMasterNoPrefix, posMasterNoPrefix: posMaster.posMasterNoPrefix,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
posMasterNoSuffix: posMaster.posMasterNoSuffix, posMasterNoSuffix: posMaster.posMasterNoSuffix,
fullname: // fullname:
posMaster.next_holder == null // posMaster.next_holder == null
? null // ? null
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, // : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
profilePosMasterNo: profilePosMasterNo:
posMasterOld == null ? null : posMasterOld.posMasterNo, posMasterOld == null ? null : posMasterOld.posMasterNo,
profilePositionName: profilePositionName:
@ -483,12 +483,12 @@ export class ReportController extends Controller {
.map(async (posMaster) => { .map(async (posMaster) => {
let posMasterOld: any = null; let posMasterOld: any = null;
if (posMaster.next_holder != null) { if (posMaster.next_holder != null) {
posMasterOld = posMasterOlds.find((posMasOld) => // posMasterOld = posMasterOlds.find((posMasOld) =>
posMasOld.current_holder == null // posMasOld.current_holder == null
? false // ? false
: posMasOld.current_holder.id === // : posMasOld.current_holder.id ===
posMaster.next_holder.id, // posMaster.next_holder.id,
); // );
} }
let positionOld: any = null; let positionOld: any = null;
if (posMasterOld != null) if (posMasterOld != null)
@ -500,10 +500,10 @@ export class ReportController extends Controller {
posMasterNoPrefix: posMaster.posMasterNoPrefix, posMasterNoPrefix: posMaster.posMasterNoPrefix,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
posMasterNoSuffix: posMaster.posMasterNoSuffix, posMasterNoSuffix: posMaster.posMasterNoSuffix,
fullname: // fullname:
posMaster.next_holder == null // posMaster.next_holder == null
? null // ? null
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, // : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
profilePosMasterNo: profilePosMasterNo:
posMasterOld == null posMasterOld == null
? null ? null

40
src/migration/1707208924575-add_table_profile5.ts Normal file
View file

@ -0,0 +1,40 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class AddTableProfile51707208924575 implements MigrationInterface {
name = 'AddTableProfile51707208924575'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`posMaster\` DROP FOREIGN KEY \`FK_22499e79738c6873fc7ede3f6dd\``);
await queryRunner.query(`ALTER TABLE \`posMaster\` DROP FOREIGN KEY \`FK_9f765a0fef405dfafbd1b5f6c0a\``);
await queryRunner.query(`ALTER TABLE \`profile\` DROP FOREIGN KEY \`FK_ee79137a2909faa188c20a70413\``);
await queryRunner.query(`ALTER TABLE \`profile\` DROP FOREIGN KEY \`FK_c2ff3f61c281ece7f3ab5a2c20b\``);
await queryRunner.query(`DROP INDEX \`REL_22499e79738c6873fc7ede3f6d\` ON \`posMaster\``);
await queryRunner.query(`DROP INDEX \`REL_9f765a0fef405dfafbd1b5f6c0\` ON \`posMaster\``);
await queryRunner.query(`DROP INDEX \`IDX_c2ff3f61c281ece7f3ab5a2c20\` ON \`profile\``);
await queryRunner.query(`DROP INDEX \`IDX_ee79137a2909faa188c20a7041\` ON \`profile\``);
await queryRunner.query(`DROP INDEX \`REL_c2ff3f61c281ece7f3ab5a2c20\` ON \`profile\``);
await queryRunner.query(`DROP INDEX \`REL_ee79137a2909faa188c20a7041\` ON \`profile\``);
await queryRunner.query(`ALTER TABLE \`profile\` DROP COLUMN \`current_holderId\``);
await queryRunner.query(`ALTER TABLE \`profile\` DROP COLUMN \`next_holderId\``);
await queryRunner.query(`ALTER TABLE \`posMaster\` ADD CONSTRAINT \`FK_9f765a0fef405dfafbd1b5f6c0a\` FOREIGN KEY (\`current_holderId\`) REFERENCES \`posMaster\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE \`posMaster\` ADD CONSTRAINT \`FK_22499e79738c6873fc7ede3f6dd\` FOREIGN KEY (\`next_holderId\`) REFERENCES \`posMaster\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`posMaster\` DROP FOREIGN KEY \`FK_22499e79738c6873fc7ede3f6dd\``);
await queryRunner.query(`ALTER TABLE \`posMaster\` DROP FOREIGN KEY \`FK_9f765a0fef405dfafbd1b5f6c0a\``);
await queryRunner.query(`ALTER TABLE \`profile\` ADD \`next_holderId\` varchar(40) NULL COMMENT 'คนที่กำลังจะมาครอง ตอนปรับโครงสร้าง ถ้าเลือกให้ใครมาครอง ProfileId ของคนนั้นจะมาอยู่ในช่องนี้ รวมทั้งตอนเลือกตำแหน่งเพื่อบรรจุ แต่งตั้ง เลื่อน ย้าย ในระบบบรรจุแต่งตั้งด้วย'`);
await queryRunner.query(`ALTER TABLE \`profile\` ADD \`current_holderId\` varchar(40) NULL COMMENT 'คนครองปัจจุบัน เมื่อทำสำเนาโครงสร้างและตำแหน่งพร้อมกับคนครองมา คนครองจะอยู่ในฟิลด์นี้'`);
await queryRunner.query(`CREATE UNIQUE INDEX \`REL_ee79137a2909faa188c20a7041\` ON \`profile\` (\`current_holderId\`)`);
await queryRunner.query(`CREATE UNIQUE INDEX \`REL_c2ff3f61c281ece7f3ab5a2c20\` ON \`profile\` (\`next_holderId\`)`);
await queryRunner.query(`CREATE UNIQUE INDEX \`IDX_ee79137a2909faa188c20a7041\` ON \`profile\` (\`current_holderId\`)`);
await queryRunner.query(`CREATE UNIQUE INDEX \`IDX_c2ff3f61c281ece7f3ab5a2c20\` ON \`profile\` (\`next_holderId\`)`);
await queryRunner.query(`CREATE UNIQUE INDEX \`REL_9f765a0fef405dfafbd1b5f6c0\` ON \`posMaster\` (\`current_holderId\`)`);
await queryRunner.query(`CREATE UNIQUE INDEX \`REL_22499e79738c6873fc7ede3f6d\` ON \`posMaster\` (\`next_holderId\`)`);
await queryRunner.query(`ALTER TABLE \`profile\` ADD CONSTRAINT \`FK_c2ff3f61c281ece7f3ab5a2c20b\` FOREIGN KEY (\`next_holderId\`) REFERENCES \`posMaster\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE \`profile\` ADD CONSTRAINT \`FK_ee79137a2909faa188c20a70413\` FOREIGN KEY (\`current_holderId\`) REFERENCES \`posMaster\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE \`posMaster\` ADD CONSTRAINT \`FK_9f765a0fef405dfafbd1b5f6c0a\` FOREIGN KEY (\`current_holderId\`) REFERENCES \`profile\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE \`posMaster\` ADD CONSTRAINT \`FK_22499e79738c6873fc7ede3f6dd\` FOREIGN KEY (\`next_holderId\`) REFERENCES \`profile\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
}