snap salary(ยังไม่เสร็จ)
This commit is contained in:
parent
5f222498cb
commit
f0e6ca6a56
7 changed files with 476 additions and 125 deletions
|
|
@ -22,6 +22,20 @@ export class SalaryOrg extends EntityBase {
|
|||
})
|
||||
rootId: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "id revision",
|
||||
length: 40,
|
||||
})
|
||||
revisionId: string;
|
||||
|
||||
@Column({
|
||||
comment: "รอบการ Snapshot",
|
||||
length: 20,
|
||||
default: "SNAP1",
|
||||
})
|
||||
snapshot: string;
|
||||
|
||||
@Column({
|
||||
comment: "จำนวนคนทั้งหมด",
|
||||
})
|
||||
|
|
@ -37,7 +51,7 @@ export class SalaryOrg extends EntityBase {
|
|||
type: "double",
|
||||
default: 0,
|
||||
})
|
||||
fifteenPoint: Double;
|
||||
fifteenPoint: number;
|
||||
|
||||
@Column({
|
||||
comment: "กลุ่ม GROUP1->กลุ่ม1 GROUP2->กลุ่ม2",
|
||||
|
|
|
|||
|
|
@ -36,6 +36,13 @@ export class SalaryPeriod extends EntityBase {
|
|||
})
|
||||
year: number;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "id revision",
|
||||
length: 40,
|
||||
})
|
||||
revisionId: string;
|
||||
|
||||
@OneToMany(() => SalaryOrg, (salaryOrg) => salaryOrg.salaryPeriod)
|
||||
salaryOrgs: SalaryOrg[];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ export class SalaryProfile extends EntityBase {
|
|||
|
||||
@Column({
|
||||
nullable: true,
|
||||
type: "double",
|
||||
comment: "เงินเดือนฐาน",
|
||||
default: null,
|
||||
})
|
||||
|
|
@ -114,6 +115,7 @@ export class SalaryProfile extends EntityBase {
|
|||
|
||||
@Column({
|
||||
nullable: true,
|
||||
type: "double",
|
||||
comment: "เงินพิเศษ",
|
||||
default: null,
|
||||
})
|
||||
|
|
@ -121,17 +123,19 @@ export class SalaryProfile extends EntityBase {
|
|||
|
||||
@Column({
|
||||
nullable: true,
|
||||
type: "double",
|
||||
comment: "จำนวนเงินที่ใช้เลื่อน",
|
||||
default: null,
|
||||
})
|
||||
amountUse: number;
|
||||
amountUse: number | null;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
type: "double",
|
||||
comment: "เงินเดือนหลังเลื่อน",
|
||||
default: null,
|
||||
})
|
||||
positionSalaryAmount: number;
|
||||
positionSalaryAmount: number | null;
|
||||
|
||||
@Column({
|
||||
comment:
|
||||
|
|
@ -141,6 +145,20 @@ export class SalaryProfile extends EntityBase {
|
|||
})
|
||||
type: string;
|
||||
|
||||
@Column({
|
||||
comment: "สถานะ",
|
||||
length: 20,
|
||||
default: "PENDING",
|
||||
})
|
||||
status: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "id revision",
|
||||
length: 40,
|
||||
})
|
||||
revisionId: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue