diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 6ff22a2..68a566a 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -1629,7 +1629,6 @@ export class SalaryPeriodController extends Controller { * Cronjob SalaryPeriod */ async CronjobSalaryPeriod() { - //bright const current = new Date(); let salaryPeriod: any; let request: any; diff --git a/src/entities/PosLevel.ts b/src/entities/PosLevel.ts index c089262..daa6e8e 100644 --- a/src/entities/PosLevel.ts +++ b/src/entities/PosLevel.ts @@ -38,7 +38,7 @@ export class PosLevel extends EntityBase { @Column({ length: 40, - comment: "เป็นระดับของประเภทตำแหน่งใด", + comment: "คีย์นอก(FK)ของตาราง posType", }) posTypeId: string; diff --git a/src/entities/SalaryOrg.ts b/src/entities/SalaryOrg.ts index eebc772..cc068f9 100644 --- a/src/entities/SalaryOrg.ts +++ b/src/entities/SalaryOrg.ts @@ -6,7 +6,7 @@ import { SalaryProfile } from "./SalaryProfile"; @Entity("salaryOrg") export class SalaryOrg extends EntityBase { @Column({ - comment: "", + comment: "คีย์นอก(FK)ของตาราง salaryPeriod", length: 40, }) salaryPeriodId: string; @@ -17,14 +17,14 @@ export class SalaryOrg extends EntityBase { status: string; @Column({ - comment: "id หน่วยงาน", + comment: "คีย์นอก(FK)ของตาราง orgRoot", length: 40, }) rootId: string; @Column({ nullable: true, - comment: "id revision", + comment: "คีย์นอก(FK)ของตาราง orgRevision", length: 40, }) revisionId: string; @@ -108,7 +108,6 @@ export class SalaryOrg extends EntityBase { }) remainingAmount: number; - @ManyToOne(() => SalaryPeriod, (salaryPeriod) => salaryPeriod.salaryOrgs) @JoinColumn({ name: "salaryPeriodId" }) salaryPeriod: SalaryPeriod; diff --git a/src/entities/SalaryPeriod.ts b/src/entities/SalaryPeriod.ts index 0c3223d..43bcb3d 100644 --- a/src/entities/SalaryPeriod.ts +++ b/src/entities/SalaryPeriod.ts @@ -44,7 +44,7 @@ export class SalaryPeriod extends EntityBase { @Column({ nullable: true, - comment: "id revision", + comment: "คีย์นอก(FK)ของตาราง orgRevision", length: 40, }) revisionId: string; diff --git a/src/entities/SalaryProfile.ts b/src/entities/SalaryProfile.ts index a7b74f2..bcb88c8 100644 --- a/src/entities/SalaryProfile.ts +++ b/src/entities/SalaryProfile.ts @@ -5,7 +5,7 @@ import { SalaryOrg } from "./SalaryOrg"; @Entity("salaryProfile") export class SalaryProfile extends EntityBase { @Column({ - comment: "", + comment: "คีย์นอก(FK)ของตาราง salaryOrg", length: 40, }) salaryOrgId: string; @@ -158,14 +158,14 @@ export class SalaryProfile extends EntityBase { @Column({ nullable: true, - comment: "", + comment: "คีย์นอก(FK)ของตาราง orgRoot", length: 40, }) rootId: string; @Column({ nullable: true, - comment: "", + comment: "ชื่อของหน่วยงาน", length: 255, default: null, }) @@ -173,14 +173,14 @@ export class SalaryProfile extends EntityBase { @Column({ nullable: true, - comment: "", + comment: "คีย์นอก(FK)ของตาราง orgChild1", length: 40, }) child1Id: string; @Column({ nullable: true, - comment: "", + comment: "ชื่อส่วนราชการ", length: 255, default: null, }) @@ -188,14 +188,14 @@ export class SalaryProfile extends EntityBase { @Column({ nullable: true, - comment: "", + comment: "คีย์นอก(FK)ของตาราง orgChild2", length: 40, }) child2Id: string; @Column({ nullable: true, - comment: "", + comment: "ชื่อส่วนราชการ", length: 255, default: null, }) @@ -203,14 +203,14 @@ export class SalaryProfile extends EntityBase { @Column({ nullable: true, - comment: "", + comment: "คีย์นอก(FK)ของตาราง orgChild3", length: 40, }) child3Id: string; @Column({ nullable: true, - comment: "", + comment: "ชื่อส่วนราชการ", length: 255, default: null, }) @@ -218,14 +218,14 @@ export class SalaryProfile extends EntityBase { @Column({ nullable: true, - comment: "", + comment: "คีย์นอก(FK)ของตาราง orgChild4", length: 40, }) child4Id: string; @Column({ nullable: true, - comment: "", + comment: "ชื่อส่วนราชการ", length: 255, default: null, }) diff --git a/src/entities/SalaryRanks.ts b/src/entities/SalaryRanks.ts index 99f0841..41998fa 100644 --- a/src/entities/SalaryRanks.ts +++ b/src/entities/SalaryRanks.ts @@ -6,7 +6,7 @@ import { Salarys } from "./Salarys"; export class SalaryRanks extends EntityBase { @Column({ length: 40, - comment: "Id ผังเงินเดือน", + comment: "คีย์นอก(FK)ของตาราง salary", }) salaryId: string; diff --git a/src/entities/Salarys.ts b/src/entities/Salarys.ts index c85faf7..b8a3588 100644 --- a/src/entities/Salarys.ts +++ b/src/entities/Salarys.ts @@ -14,13 +14,13 @@ export class Salarys extends EntityBase { @Column({ length: 40, - comment: "Id ประเภทของตำแหน่ง", + comment: "คีย์นอก(FK)ของตาราง posType", }) posTypeId: string; @Column({ length: 40, - comment: "Id ระดับของตำแหน่ง", + comment: "คีย์นอก(FK)ของตาราง posLevel", }) posLevelId: string;