add entity org part 2
This commit is contained in:
parent
8717494690
commit
d5e79acb82
11 changed files with 1442 additions and 1 deletions
|
|
@ -1,6 +1,7 @@
|
|||
import { Entity, Column, OneToMany, OneToOne, JoinColumn, ManyToMany, ManyToOne, Double } from "typeorm";
|
||||
import { EntityBase } from "./base/Base";
|
||||
import { Profile } from "./Profile" ;
|
||||
import { ProfileSalaryHistory } from "./ProfileSalaryHistory";
|
||||
|
||||
@Entity("profileSalary")
|
||||
export class ProfileSalary extends EntityBase {
|
||||
|
|
@ -42,6 +43,209 @@ export class ProfileSalary extends EntityBase {
|
|||
})
|
||||
profileId: string;
|
||||
|
||||
@Column({
|
||||
comment: "สถานะการใช้งาน",
|
||||
default: false,
|
||||
})
|
||||
isActive: boolean;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ตำแหน่ง (รายละเอียด)",
|
||||
type: "text",
|
||||
default: null,
|
||||
})
|
||||
salaryClass: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "เอกสารอ้างอิง",
|
||||
type: "text",
|
||||
default: null,
|
||||
})
|
||||
salaryRef: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id เลขที่ตำแหน่ง",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
posNoId: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id เลขที่ตำแหน่ง",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionId: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id สังกัด",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
ocId: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id ตำแหน่งทางการบริหาร",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionExecutiveId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id ด้านทางการบริหาร",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionExecutiveSideId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionLevelId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id สายงาน",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionLineId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id ด้าน/สาขา",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionPathSideId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id ประเภทตำแหน่ง",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionTypeId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id ชื่อย่อหน่วยงาน",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
organizationShortNameId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id กลุ่มงาน",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionEmployeeGroupId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id ระดับชั้นงาน",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionEmployeeLevelId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id ตำแหน่ง",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionEmployeePositionId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id ด้านของตำแหน่ง",
|
||||
type: "uuid",
|
||||
default: null,
|
||||
})
|
||||
positionEmployeePositionSideId : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
length: 40,
|
||||
comment: "Id เลขที่ตำแหน่งลูกจ้าง",
|
||||
type: "text",
|
||||
default: null,
|
||||
})
|
||||
posNoEmployee : string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
type: "datetime",
|
||||
comment: "เอกสารอ้างอิง (ลงวันที่)",
|
||||
default: null,
|
||||
})
|
||||
refCommandDate: Date;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "เอกสารอ้างอิง (เลขที่คำสั่ง)",
|
||||
type: "text",
|
||||
default: null,
|
||||
})
|
||||
refCommandNo: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ลำดับ",
|
||||
default: null,
|
||||
})
|
||||
order: number;
|
||||
|
||||
@Column({
|
||||
comment: "เลขที่คำสั่ง",
|
||||
type: "text",
|
||||
})
|
||||
commandNo: string;
|
||||
|
||||
@Column({
|
||||
comment: "ประเภทคำสั่ง",
|
||||
type: "text",
|
||||
})
|
||||
commandTypeName: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ประเภทตำแหน่งกรณีพิเศษ",
|
||||
type: "text",
|
||||
default: null,
|
||||
})
|
||||
salaryStatus: string;
|
||||
|
||||
@OneToMany(() => ProfileSalaryHistory, (profileSalaryHistory) => profileSalaryHistory.histories)
|
||||
profileSalaryHistories: ProfileSalaryHistory[];
|
||||
|
||||
@ManyToOne(() => Profile, (profile) => profile.profileSalary)
|
||||
@JoinColumn({ name: "profileId" })
|
||||
profile: Profile;
|
||||
|
|
@ -75,6 +279,78 @@ export class CreateProfileSalary {
|
|||
})
|
||||
profileId: string;
|
||||
|
||||
// @Column()
|
||||
// isActive: boolean;
|
||||
|
||||
// @Column()
|
||||
// salaryClass: string | null;
|
||||
|
||||
// @Column()
|
||||
// salaryRef: string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// posNoId: string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionId: string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// ocId: string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionExecutiveId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionExecutiveSideId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionLevelId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionLineId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionPathSideId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionTypeId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// organizationShortNameId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionEmployeeGroupId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionEmployeeLevelId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionEmployeePositionId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionEmployeePositionSideId : string | null;
|
||||
|
||||
// @Column()
|
||||
// posNoEmployee : string | null;
|
||||
|
||||
// @Column()
|
||||
// refCommandDate: Date | null;
|
||||
|
||||
// @Column()
|
||||
// refCommandNo: string | null;
|
||||
|
||||
// @Column()
|
||||
// order: number | null;
|
||||
|
||||
// @Column()
|
||||
// commandNo: string;
|
||||
|
||||
// @Column()
|
||||
// commandTypeName: string;
|
||||
|
||||
// @Column()
|
||||
// salaryStatus: string | null;
|
||||
|
||||
}
|
||||
|
||||
export class UpdateProfileSalary {
|
||||
|
|
@ -99,5 +375,77 @@ export class UpdateProfileSalary {
|
|||
})
|
||||
mouthSalaryAmount: Double;
|
||||
|
||||
// @Column()
|
||||
// isActive: boolean;
|
||||
|
||||
// @Column()
|
||||
// salaryClass: string | null;
|
||||
|
||||
// @Column()
|
||||
// salaryRef: string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// posNoId: string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionId: string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// ocId: string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionExecutiveId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionExecutiveSideId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionLevelId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionLineId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionPathSideId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionTypeId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// organizationShortNameId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionEmployeeGroupId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionEmployeeLevelId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionEmployeePositionId : string | null;
|
||||
|
||||
// @Column("uuid")
|
||||
// positionEmployeePositionSideId : string | null;
|
||||
|
||||
// @Column()
|
||||
// posNoEmployee : string | null;
|
||||
|
||||
// @Column()
|
||||
// refCommandDate: Date | null;
|
||||
|
||||
// @Column()
|
||||
// refCommandNo: string | null;
|
||||
|
||||
// @Column()
|
||||
// order: number | null;
|
||||
|
||||
// @Column()
|
||||
// commandNo: string;
|
||||
|
||||
// @Column()
|
||||
// commandTypeName: string;
|
||||
|
||||
// @Column()
|
||||
// salaryStatus: string | null;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue