add missing field, approval, requested_by

This commit is contained in:
fadlydev
2025-02-06 12:16:23 +07:00
parent 59f5d6b18c
commit 1e9293d944

View File

@ -26,6 +26,11 @@ export class RequestSubmission {
@JoinColumn({ name: 'request_order_id' }) @JoinColumn({ name: 'request_order_id' })
request_order: RequestOrder; request_order: RequestOrder;
@Column({ type: 'varchar', nullable: false })
requested_by: string;
@Column({ type: 'varchar', nullable: false })
department: string;
@Column({ type: 'varchar', nullable: false, unique: true }) @Column({ type: 'varchar', nullable: false, unique: true })
code_id: string; code_id: string;
@ -36,9 +41,6 @@ export class RequestSubmission {
@Column({ type: 'text', nullable: true }) @Column({ type: 'text', nullable: true })
remarks: string; remarks: string;
@Column({ type: 'varchar', nullable: true })
department: string;
@Column({ length: 64, nullable: false }) @Column({ length: 64, nullable: false })
status: string; status: string;
@ -54,19 +56,6 @@ export class RequestSubmission {
@Column({ type: 'decimal', precision: 12, scale: 2, nullable: false, default: 0.0 }) @Column({ type: 'decimal', precision: 12, scale: 2, nullable: false, default: 0.0 })
amount: number; amount: number;
@Column({ type: 'decimal', precision: 12, scale: 2, nullable: false, default: 0.0 })
total: number;
// Supervisor Approval
@Column({ type: 'varchar', nullable: true })
approved_by_spv: string | null;
@Column({ type: 'timestamp', nullable: true })
spv_approval_date: Date | null;
@Column({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING })
spv_approval_status: ApprovalStatus;
// General Manager Approval // General Manager Approval
@Column({ type: 'varchar', nullable: true }) @Column({ type: 'varchar', nullable: true })
approved_by_gm: string | null; approved_by_gm: string | null;
@ -77,16 +66,9 @@ export class RequestSubmission {
@Column({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING }) @Column({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING })
gm_approval_status: ApprovalStatus; gm_approval_status: ApprovalStatus;
// General Affairs (GA) Approval @Column({ type: 'text', nullable: true })
@Column({ type: 'varchar', nullable: true }) gm_approval_remarks: string | null;
approved_by_ga: string | null;
@Column({ type: 'timestamp', nullable: true })
ga_approval_date: Date | null;
@Column({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING })
ga_approval_status: ApprovalStatus;
@CreateDateColumn() @CreateDateColumn()
created_at: Date; created_at: Date;