From 5e28d40ec3efa8c678b98bc974da8c4e15ccbcaa Mon Sep 17 00:00:00 2001 From: asansal Date: Sun, 2 Nov 2025 01:02:12 +0700 Subject: [PATCH 1/2] fixing entity earchive --- src/entity/earchive_doc.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/entity/earchive_doc.ts b/src/entity/earchive_doc.ts index 8e5932b..b5cbeaf 100644 --- a/src/entity/earchive_doc.ts +++ b/src/entity/earchive_doc.ts @@ -44,25 +44,25 @@ export class EarchiveDoc { @Column({ name: 'docdates', nullable: true }) docdates: Date; - @Column({ name: 'approvalbyid', type: 'uuid', nullable: true }) - approvalbyid: string; + // @Column({ name: 'approvalbyid', type: 'uuid', nullable: true }) + // approvalbyid: string; // @OneToOne(() => User, { nullable: true }) // @JoinColumn({ name: 'approvalbyid' }) // approvalby: User - @Column({ name: 'approvaldate', nullable: true }) - approvaldate: Date; + // @Column({ name: 'approvaldate', nullable: true }) + // approvaldate: Date; - @Column({ name: 'dispositionbyid', type: 'uuid', nullable: true }) - dispositionbyid: string; + // @Column({ name: 'dispositionbyid', type: 'uuid', nullable: true }) + // dispositionbyid: string; // @OneToOne(() => User, { nullable: true }) // @JoinColumn({ name: 'dispositionbyid' }) // dispositionby: User - @Column({ name: 'dispositiondate', nullable: true }) - dispositiondate: Date; + // @Column({ name: 'dispositiondate', nullable: true }) + // dispositiondate: Date; @Column({ name: 'attachdoc', nullable: true }) attachdoc: string; From 76bcd5aba1c4c4ca9c1ea32d1c3f9b16d78e9b06 Mon Sep 17 00:00:00 2001 From: asansal Date: Sun, 2 Nov 2025 12:28:36 +0700 Subject: [PATCH 2/2] add nik,employee approval --- src/entity/earchive_approval.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/entity/earchive_approval.ts b/src/entity/earchive_approval.ts index 64fc3dd..4ba222b 100644 --- a/src/entity/earchive_approval.ts +++ b/src/entity/earchive_approval.ts @@ -14,7 +14,13 @@ export class EarchiveApproval { @JoinColumn({ name: 'docid' }) doc: EarchiveDoc; - @Column({ name: 'uuidapproval', type: 'uuid', nullable: true }) + @Column({ name: 'nik', nullable: true }) + nik: string; + + @Column({ name: 'employeename', nullable: true }) + employeename: string; + + @Column({ name: 'uuidapproval', type: 'uuid', nullable: true }) uuidapproval: string; @Column({ name: 'approvaldate', nullable: true })