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

เงินเดือนไม่มีค่าให้เป็นnull

Browse source
This commit is contained in:
Kittapath 2024-02-29 14:07:27 +07:00
parent 6791dde26f
commit 0888d3d8d8
3 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/SalaryPeriodController.ts
View file

@ -388,7 +388,7 @@ export class SalaryPeriodController extends Controller {
if (body.type == "NONE") {
salaryProfile.amountSpecial = 0;
salaryProfile.amountUse = 0;
salaryProfile.positionSalaryAmount = salaryProfile.amount;
salaryProfile.positionSalaryAmount = salaryProfile.amount == null ? 0 : salaryProfile.amount;
} else if (body.type == "PENDING") {
salaryProfile.amountSpecial = 0;
salaryProfile.amountUse = 0;

25
src/entities/SalaryProfile.ts
View file

@ -111,31 +111,28 @@ export class SalaryProfile extends EntityBase {
comment: "เงินเดือนฐาน",
default: null,
})
amount: number;
amount: number | null;
@Column({
nullable: true,
type: "double",
comment: "เงินพิเศษ",
default: null,
default: 0,
})
amountSpecial: number;
@Column({
nullable: true,
type: "double",
comment: "จำนวนเงินที่ใช้เลื่อน",
default: null,
default: 0,
})
amountUse: number | null;
amountUse: number;
@Column({
nullable: true,
type: "double",
comment: "เงินเดือนหลังเลื่อน",
default: null,
default: 0,
})
positionSalaryAmount: number | null;
positionSalaryAmount: number;
@Column({
comment:
@ -358,19 +355,19 @@ export class CreateSalaryProfile {
child4: string | null;
@Column()
result: string;
result: string | null;
@Column()
duration: string;
duration: string | null;
@Column()
punish: string;
punish: string | null;
@Column()
retired: string;
retired: string | null;
@Column()
retired2: string;
retired2: string | null;
@Column()
isRetired: boolean;

18
src/migration/1709189881087-update_table_salaryProfile_add_isretired1.ts Normal file
View file

@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableSalaryProfileAddIsretired11709189881087 implements MigrationInterface {
name = 'UpdateTableSalaryProfileAddIsretired11709189881087'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amountSpecial\` \`amountSpecial\` double NOT NULL COMMENT 'เงินพิเศษ' DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amountUse\` \`amountUse\` double NOT NULL COMMENT 'จำนวนเงินที่ใช้เลื่อน' DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`positionSalaryAmount\` \`positionSalaryAmount\` double NOT NULL COMMENT 'เงินเดือนหลังเลื่อน' DEFAULT '0'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`positionSalaryAmount\` \`positionSalaryAmount\` double NULL COMMENT 'เงินเดือนหลังเลื่อน'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amountUse\` \`amountUse\` double NULL COMMENT 'จำนวนเงินที่ใช้เลื่อน'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amountSpecial\` \`amountSpecial\` double NULL COMMENT 'เงินพิเศษ'`);
}
}