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

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

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;