Merge branch 'develop'
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10
commit
41d80ce633
2 changed files with 327 additions and 367 deletions
|
|
@ -1,232 +1,192 @@
|
|||
import {
|
||||
CreateEvaluateCommander,
|
||||
EvaluateCommander,
|
||||
} from "./EvaluateCommander";
|
||||
import {
|
||||
Entity,
|
||||
Column,
|
||||
OneToMany,
|
||||
JoinColumn,
|
||||
PrimaryGeneratedColumn,
|
||||
ManyToOne,
|
||||
} from "typeorm";
|
||||
import { EntityBase } from "./base/Base";
|
||||
import {
|
||||
AssignCompetencyGroup,
|
||||
CreateAssignCompetencyGroup,
|
||||
} from "./AssignCompetencyGroup";
|
||||
import { CreateSurvel, Survey } from "./Survey";
|
||||
import { AssignCompetency, CreateAssignCompetency } from "./AssignCompetency";
|
||||
import { AssignDirector, CreateAssignDirector } from "./AssignDirector";
|
||||
import { AssignJob, CreateAssignJob } from "./AssignJob";
|
||||
import { AssignKnowledge, CreateAssignKnowledge } from "./AssignKnowledge";
|
||||
import { AssignLaw, CreateAssignLaw } from "./AssignLaw";
|
||||
import { AssignOutput, CreateAssignOutput } from "./AssignOutput";
|
||||
import { AssignSkill, CreateAssignSkill } from "./AssignSkill";
|
||||
import {
|
||||
CreateEvaluateAchievement,
|
||||
EvaluateAchievement,
|
||||
} from "./EvaluateAchievement";
|
||||
import { CreateEvaluateAssessor, EvaluateAssessor } from "./EvaluateAssessor";
|
||||
import { CreateEvaluateChairman, EvaluateChairman } from "./EvaluateChairman";
|
||||
import { CreateEvaluateResult, EvaluateResult } from "./EvaluateResult";
|
||||
import { Personal } from "./Personal";
|
||||
import { CreateEvaluateCommander, EvaluateCommander } from "./EvaluateCommander"
|
||||
import { Entity, Column, OneToMany, JoinColumn, PrimaryGeneratedColumn, ManyToOne } from "typeorm"
|
||||
import { EntityBase } from "./base/Base"
|
||||
import { AssignCompetencyGroup, CreateAssignCompetencyGroup } from "./AssignCompetencyGroup"
|
||||
import { CreateSurvel, Survey } from "./Survey"
|
||||
import { AssignCompetency, CreateAssignCompetency } from "./AssignCompetency"
|
||||
import { AssignDirector, CreateAssignDirector } from "./AssignDirector"
|
||||
import { AssignJob, CreateAssignJob } from "./AssignJob"
|
||||
import { AssignKnowledge, CreateAssignKnowledge } from "./AssignKnowledge"
|
||||
import { AssignLaw, CreateAssignLaw } from "./AssignLaw"
|
||||
import { AssignOutput, CreateAssignOutput } from "./AssignOutput"
|
||||
import { AssignSkill, CreateAssignSkill } from "./AssignSkill"
|
||||
import { CreateEvaluateAchievement, EvaluateAchievement } from "./EvaluateAchievement"
|
||||
import { CreateEvaluateAssessor, EvaluateAssessor } from "./EvaluateAssessor"
|
||||
import { CreateEvaluateChairman, EvaluateChairman } from "./EvaluateChairman"
|
||||
import { CreateEvaluateResult, EvaluateResult } from "./EvaluateResult"
|
||||
import { Personal } from "./Personal"
|
||||
|
||||
@Entity("assign")
|
||||
export class Assign extends EntityBase {
|
||||
@PrimaryGeneratedColumn("uuid")
|
||||
id: string;
|
||||
@PrimaryGeneratedColumn("uuid")
|
||||
id: string
|
||||
|
||||
@Column({
|
||||
nullable: false,
|
||||
type: "uuid",
|
||||
comment: "Id ของบุคคล",
|
||||
})
|
||||
personal_id: string;
|
||||
@Column({
|
||||
nullable: false,
|
||||
type: "uuid",
|
||||
comment: "Id ของบุคคล",
|
||||
})
|
||||
personal_id: string
|
||||
|
||||
@Column({
|
||||
type: "int",
|
||||
nullable: false,
|
||||
comment: "ครั้งที่แบบมอบหมายงาน",
|
||||
default: 0,
|
||||
})
|
||||
round_no!: number;
|
||||
@Column({
|
||||
type: "int",
|
||||
nullable: false,
|
||||
comment: "ครั้งที่แบบมอบหมายงาน",
|
||||
default: 0,
|
||||
})
|
||||
round_no!: number
|
||||
|
||||
@Column({
|
||||
type: "date",
|
||||
nullable: false,
|
||||
comment: "วันที่เริ่มทดลองงาน",
|
||||
})
|
||||
date_start: Date;
|
||||
@Column({
|
||||
type: "date",
|
||||
nullable: false,
|
||||
comment: "วันที่เริ่มทดลองงาน",
|
||||
})
|
||||
date_start: Date
|
||||
|
||||
@Column({
|
||||
type: "date",
|
||||
nullable: false,
|
||||
comment: "วันที่สิ้นสุดทดลองงาน",
|
||||
})
|
||||
date_finish: Date;
|
||||
@Column({
|
||||
type: "date",
|
||||
nullable: false,
|
||||
comment: "วันที่สิ้นสุดทดลองงาน",
|
||||
})
|
||||
date_finish: Date
|
||||
|
||||
@Column({
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "อื่นๆ(3.5)",
|
||||
default: null,
|
||||
})
|
||||
other4_desc!: string;
|
||||
@Column({
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "อื่นๆ(3.5)",
|
||||
default: null,
|
||||
})
|
||||
other4_desc!: string
|
||||
|
||||
@Column({
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "อื่นๆ(5.2)",
|
||||
default: null,
|
||||
})
|
||||
other5_no1_desc!: string;
|
||||
@Column({
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "อื่นๆ(5.2)",
|
||||
default: null,
|
||||
})
|
||||
other5_no1_desc!: string
|
||||
|
||||
@Column({
|
||||
type: "date",
|
||||
nullable: true,
|
||||
comment: "ผู้ทดลองปฏิบัติหน้าที่ราชการลงวันที่",
|
||||
})
|
||||
experimenter_dated!: Date;
|
||||
@Column({
|
||||
type: "date",
|
||||
nullable: true,
|
||||
comment: "ผู้ทดลองปฏิบัติหน้าที่ราชการลงวันที่",
|
||||
})
|
||||
experimenter_dated!: Date
|
||||
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "สถานะการใช้งาน 1 คือใช้งานปกติ, 0 คือไม่ใช้งาน",
|
||||
default: 1,
|
||||
})
|
||||
active: number;
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "สถานะการใช้งาน 1 คือใช้งานปกติ, 0 คือไม่ใช้งาน",
|
||||
default: 1,
|
||||
})
|
||||
active: number
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "กฎหมายอื่นๆ",
|
||||
})
|
||||
other_desc!: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "กฎหมายอื่นๆ",
|
||||
})
|
||||
other_desc!: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "Id ของการแต่งตั้งคณะกรรมการ",
|
||||
})
|
||||
appointId: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "Id ของการแต่งตั้งคณะกรรมการ",
|
||||
})
|
||||
appointId: string
|
||||
|
||||
@ManyToOne(() => Personal, (person: Personal) => person.personal_id)
|
||||
@JoinColumn({ name: "personal_id" })
|
||||
profile: Personal;
|
||||
@ManyToOne(() => Personal, (person: Personal) => person.assign)
|
||||
@JoinColumn({ name: "personal_id" })
|
||||
profile: Personal
|
||||
|
||||
@OneToMany(
|
||||
() => AssignCompetencyGroup,
|
||||
(competencyGroup: AssignCompetencyGroup) => competencyGroup.assign
|
||||
)
|
||||
@JoinColumn({ name: "id" })
|
||||
competencyGroups: AssignCompetencyGroup[];
|
||||
@OneToMany(() => AssignCompetencyGroup, (competencyGroup: AssignCompetencyGroup) => competencyGroup.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
competencyGroups: AssignCompetencyGroup[]
|
||||
|
||||
@OneToMany(
|
||||
() => AssignCompetency,
|
||||
(competency: AssignCompetency) => competency.assign
|
||||
)
|
||||
@JoinColumn({ name: "id" })
|
||||
competencys: AssignCompetency[];
|
||||
@OneToMany(() => AssignCompetency, (competency: AssignCompetency) => competency.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
competencys: AssignCompetency[]
|
||||
|
||||
@OneToMany(
|
||||
() => AssignDirector,
|
||||
(director: AssignDirector) => director.assign
|
||||
)
|
||||
@JoinColumn({ name: "id" })
|
||||
directors: AssignDirector[];
|
||||
@OneToMany(() => AssignDirector, (director: AssignDirector) => director.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
directors: AssignDirector[]
|
||||
|
||||
@OneToMany(() => AssignJob, (job: AssignJob) => job.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
jobs: AssignJob[];
|
||||
@OneToMany(() => AssignJob, (job: AssignJob) => job.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
jobs: AssignJob[]
|
||||
|
||||
@OneToMany(
|
||||
() => AssignKnowledge,
|
||||
(knowledge: AssignKnowledge) => knowledge.assign
|
||||
)
|
||||
@JoinColumn({ name: "id" })
|
||||
knowledges: AssignKnowledge[];
|
||||
@OneToMany(() => AssignKnowledge, (knowledge: AssignKnowledge) => knowledge.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
knowledges: AssignKnowledge[]
|
||||
|
||||
@OneToMany(() => AssignLaw, (law: AssignLaw) => law.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
laws: AssignLaw[];
|
||||
@OneToMany(() => AssignLaw, (law: AssignLaw) => law.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
laws: AssignLaw[]
|
||||
|
||||
@OneToMany(() => AssignOutput, (output: AssignOutput) => output.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
outputs: AssignOutput[];
|
||||
@OneToMany(() => AssignOutput, (output: AssignOutput) => output.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
outputs: AssignOutput[]
|
||||
|
||||
@OneToMany(() => AssignSkill, (skill: AssignSkill) => skill.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
skills: AssignSkill[];
|
||||
@OneToMany(() => AssignSkill, (skill: AssignSkill) => skill.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
skills: AssignSkill[]
|
||||
|
||||
@OneToMany(() => Survey, (survey: Survey) => survey.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
surveys: Survey;
|
||||
@OneToMany(() => Survey, (survey: Survey) => survey.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
surveys: Survey
|
||||
|
||||
@OneToMany(
|
||||
() => EvaluateAchievement,
|
||||
(evaluateAchievement: EvaluateAchievement) => evaluateAchievement.assign
|
||||
)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateAchievements: EvaluateAchievement;
|
||||
@OneToMany(() => EvaluateAchievement, (evaluateAchievement: EvaluateAchievement) => evaluateAchievement.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateAchievements: EvaluateAchievement
|
||||
|
||||
@OneToMany(
|
||||
() => EvaluateAssessor,
|
||||
(evaluateAssessor: EvaluateAssessor) => evaluateAssessor.assign
|
||||
)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateAssessors: EvaluateAssessor;
|
||||
@OneToMany(() => EvaluateAssessor, (evaluateAssessor: EvaluateAssessor) => evaluateAssessor.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateAssessors: EvaluateAssessor
|
||||
|
||||
@OneToMany(
|
||||
() => EvaluateChairman,
|
||||
(evaluateChairman: EvaluateChairman) => evaluateChairman.assign
|
||||
)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateChairmans: EvaluateChairman;
|
||||
@OneToMany(() => EvaluateChairman, (evaluateChairman: EvaluateChairman) => evaluateChairman.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateChairmans: EvaluateChairman
|
||||
|
||||
@OneToMany(
|
||||
() => EvaluateCommander,
|
||||
(evaluateCommander: EvaluateCommander) => evaluateCommander.assign
|
||||
)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateCommanders: EvaluateCommander;
|
||||
@OneToMany(() => EvaluateCommander, (evaluateCommander: EvaluateCommander) => evaluateCommander.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateCommanders: EvaluateCommander
|
||||
|
||||
@OneToMany(() => EvaluateResult, (result: EvaluateResult) => result.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateResults: EvaluateResult;
|
||||
@OneToMany(() => EvaluateResult, (result: EvaluateResult) => result.assign)
|
||||
@JoinColumn({ name: "id" })
|
||||
evaluateResults: EvaluateResult
|
||||
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "id คณะกรรมการที่จะประเมินผล",
|
||||
})
|
||||
reportPersonId: string;
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "id คณะกรรมการที่จะประเมินผล",
|
||||
})
|
||||
reportPersonId: string
|
||||
}
|
||||
|
||||
export class CreateAssign {
|
||||
@Column()
|
||||
date_start: Date;
|
||||
@Column()
|
||||
date_finish: Date;
|
||||
@Column()
|
||||
other4_desc?: string;
|
||||
@Column()
|
||||
other5_no1_desc?: string;
|
||||
@Column()
|
||||
experimenter_dated?: Date;
|
||||
@Column()
|
||||
personalId?: string;
|
||||
fullname?: string;
|
||||
position?: string;
|
||||
monthSelect?: number;
|
||||
other_desc?: string;
|
||||
appointId?: string;
|
||||
reportPersonId?: string;
|
||||
@Column()
|
||||
date_start: Date
|
||||
@Column()
|
||||
date_finish: Date
|
||||
@Column()
|
||||
other4_desc?: string
|
||||
@Column()
|
||||
other5_no1_desc?: string
|
||||
@Column()
|
||||
experimenter_dated?: Date
|
||||
@Column()
|
||||
personalId?: string
|
||||
fullname?: string
|
||||
position?: string
|
||||
monthSelect?: number
|
||||
other_desc?: string
|
||||
appointId?: string
|
||||
reportPersonId?: string
|
||||
|
||||
assign_competency_group: CreateAssignCompetencyGroup[];
|
||||
assign_competency: CreateAssignCompetency[];
|
||||
assign_director: CreateAssignDirector[];
|
||||
assign_jobs: CreateAssignJob[];
|
||||
assign_knowledges: CreateAssignKnowledge[];
|
||||
assign_law: CreateAssignLaw[];
|
||||
assign_outputs: CreateAssignOutput[];
|
||||
assign_skill: CreateAssignSkill[];
|
||||
assign_competency_group: CreateAssignCompetencyGroup[]
|
||||
assign_competency: CreateAssignCompetency[]
|
||||
assign_director: CreateAssignDirector[]
|
||||
assign_jobs: CreateAssignJob[]
|
||||
assign_knowledges: CreateAssignKnowledge[]
|
||||
assign_law: CreateAssignLaw[]
|
||||
assign_outputs: CreateAssignOutput[]
|
||||
assign_skill: CreateAssignSkill[]
|
||||
}
|
||||
|
||||
export type UpdateAssign = Partial<CreateAssign>;
|
||||
export type UpdateAssign = Partial<CreateAssign>
|
||||
|
|
|
|||
|
|
@ -1,205 +1,205 @@
|
|||
import { Entity, Column, PrimaryGeneratedColumn, OneToOne, JoinColumn, OneToMany } from "typeorm";
|
||||
import { EntityBase } from "./base/Base";
|
||||
import { Assign } from "./Assign";
|
||||
import { Appoint } from "./Appoint";
|
||||
import { Entity, Column, PrimaryGeneratedColumn, OneToOne, JoinColumn, OneToMany } from "typeorm"
|
||||
import { EntityBase } from "./base/Base"
|
||||
import { Assign } from "./Assign"
|
||||
import { Appoint } from "./Appoint"
|
||||
|
||||
@Entity("personal")
|
||||
export class Personal extends EntityBase {
|
||||
@PrimaryGeneratedColumn("uuid")
|
||||
personal_id: string;
|
||||
@PrimaryGeneratedColumn("uuid")
|
||||
personal_id: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "เลขที่คำสั่งบรรจุ",
|
||||
})
|
||||
order_number!: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "เลขที่คำสั่งบรรจุ",
|
||||
})
|
||||
order_number!: string
|
||||
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment:
|
||||
"1 อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ, 2 พ้นการทดลองปฏิบัติหน้าที่ราชการ, 3 ไม่พ้นการทดลองปฏิบัติหน้าที่ราชการ, 4 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากเปลี่ยนตำแหน่ง, 5 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากลาออก, 6 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากถึงแก่กรรม, 7 ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการ, 8 ดึงรายชื่อไปออกคำสั่งแล้ว",
|
||||
default: 1,
|
||||
})
|
||||
probation_status: number;
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment:
|
||||
"1 อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ, 2 พ้นการทดลองปฏิบัติหน้าที่ราชการ, 3 ไม่พ้นการทดลองปฏิบัติหน้าที่ราชการ, 4 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากเปลี่ยนตำแหน่ง, 5 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากลาออก, 6 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากถึงแก่กรรม, 7 ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการ, 8 ดึงรายชื่อไปออกคำสั่งแล้ว",
|
||||
default: 1,
|
||||
})
|
||||
probation_status: number
|
||||
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "สถานะการใช้งาน 1 คือใช้งานปกติ, 0 คือไม่ใช้งาน",
|
||||
default: 1,
|
||||
})
|
||||
active: number;
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "สถานะการใช้งาน 1 คือใช้งานปกติ, 0 คือไม่ใช้งาน",
|
||||
default: 1,
|
||||
})
|
||||
active: number
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "คำนำหน้าชื่อ",
|
||||
})
|
||||
prefixName: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "คำนำหน้าชื่อ",
|
||||
})
|
||||
prefixName: string
|
||||
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "ชื่อ",
|
||||
})
|
||||
firstName: string;
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "ชื่อ",
|
||||
})
|
||||
firstName: string
|
||||
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "นามสกุล",
|
||||
})
|
||||
lastName: string;
|
||||
@Column({
|
||||
nullable: false,
|
||||
comment: "นามสกุล",
|
||||
})
|
||||
lastName: string
|
||||
|
||||
@Column({
|
||||
type: Boolean,
|
||||
comment: "สถานะการทดลองงาน 1 คืออยู่ระหว่างการทดลองงาน, 0 คือไม่อยู่ระหว่างการทดลองงาน",
|
||||
default: 0,
|
||||
})
|
||||
isProbation: number;
|
||||
@Column({
|
||||
type: Boolean,
|
||||
comment: "สถานะการทดลองงาน 1 คืออยู่ระหว่างการทดลองงาน, 0 คือไม่อยู่ระหว่างการทดลองงาน",
|
||||
default: 0,
|
||||
})
|
||||
isProbation: number
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ตำแหน่งในสายงาน",
|
||||
})
|
||||
positionName: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ตำแหน่งในสายงาน",
|
||||
})
|
||||
positionName: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "เลขที่ตำแหน่ง",
|
||||
})
|
||||
posNo: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "เลขที่ตำแหน่ง",
|
||||
})
|
||||
posNo: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ระดับตำแหน่ง",
|
||||
})
|
||||
positionLevelName: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ระดับตำแหน่ง",
|
||||
})
|
||||
positionLevelName: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ด้าน/สาขา",
|
||||
})
|
||||
positionLineName: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ด้าน/สาขา",
|
||||
})
|
||||
positionLineName: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ประเภทตำแหน่ง",
|
||||
})
|
||||
positionTypeName: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "ประเภทตำแหน่ง",
|
||||
})
|
||||
positionTypeName: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "หน่วยงาน",
|
||||
})
|
||||
orgRootName: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "หน่วยงาน",
|
||||
})
|
||||
orgRootName: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "สังกัด",
|
||||
})
|
||||
organization: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "สังกัด",
|
||||
})
|
||||
organization: string
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "เลขบัตรประจำตัวประชาชน",
|
||||
})
|
||||
idcard: string;
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "เลขบัตรประจำตัวประชาชน",
|
||||
})
|
||||
idcard: string
|
||||
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน root", default: null })
|
||||
root: string;
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน root", default: null })
|
||||
root: string
|
||||
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน child1", default: null })
|
||||
child1: string;
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน child1", default: null })
|
||||
child1: string
|
||||
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน child2", default: null })
|
||||
child2: string;
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน child2", default: null })
|
||||
child2: string
|
||||
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน child3", default: null })
|
||||
child3: string;
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน child3", default: null })
|
||||
child3: string
|
||||
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน child4", default: null })
|
||||
child4: string;
|
||||
@Column({ nullable: true, comment: "id หน่วยงาน child4", default: null })
|
||||
child4: string
|
||||
|
||||
@OneToMany(() => Assign, (assign: Assign) => assign.personal_id)
|
||||
@JoinColumn({ name: "personal_id" })
|
||||
assign: Assign[];
|
||||
@OneToMany(() => Assign, (assign: Assign) => assign.personal_id)
|
||||
@JoinColumn({ name: "id" })
|
||||
assign: Assign[]
|
||||
|
||||
@OneToOne(() => Appoint, (appoint: Appoint) => appoint.profileId)
|
||||
@JoinColumn({ name: "personal_id" })
|
||||
appoint: Appoint;
|
||||
@OneToOne(() => Appoint, (appoint: Appoint) => appoint.profileId)
|
||||
@JoinColumn({ name: "personal_id" })
|
||||
appoint: Appoint
|
||||
}
|
||||
|
||||
export class CreatePersonal {
|
||||
@Column()
|
||||
personal_id: string;
|
||||
@Column()
|
||||
order_number: string;
|
||||
@Column()
|
||||
probation_status: number;
|
||||
// @Column()
|
||||
// profiles: PersonalProfile;
|
||||
@Column()
|
||||
createdUserId: string;
|
||||
@Column()
|
||||
createdFullName: string;
|
||||
@Column()
|
||||
updateUserId: string;
|
||||
@Column()
|
||||
updateFullName: string;
|
||||
@Column()
|
||||
prefixName: string;
|
||||
@Column()
|
||||
firstName: string;
|
||||
@Column()
|
||||
lastName: string;
|
||||
@Column()
|
||||
isProbation: number;
|
||||
@Column()
|
||||
positionName: string;
|
||||
@Column()
|
||||
posNo: string;
|
||||
@Column()
|
||||
positionLevelName: string;
|
||||
@Column()
|
||||
positionTypeName: string;
|
||||
@Column()
|
||||
positionLineName: string;
|
||||
@Column()
|
||||
orgRootName: string;
|
||||
@Column()
|
||||
organization: string;
|
||||
@Column()
|
||||
idcard: string;
|
||||
@Column()
|
||||
personal_id: string
|
||||
@Column()
|
||||
order_number: string
|
||||
@Column()
|
||||
probation_status: number
|
||||
// @Column()
|
||||
// profiles: PersonalProfile;
|
||||
@Column()
|
||||
createdUserId: string
|
||||
@Column()
|
||||
createdFullName: string
|
||||
@Column()
|
||||
updateUserId: string
|
||||
@Column()
|
||||
updateFullName: string
|
||||
@Column()
|
||||
prefixName: string
|
||||
@Column()
|
||||
firstName: string
|
||||
@Column()
|
||||
lastName: string
|
||||
@Column()
|
||||
isProbation: number
|
||||
@Column()
|
||||
positionName: string
|
||||
@Column()
|
||||
posNo: string
|
||||
@Column()
|
||||
positionLevelName: string
|
||||
@Column()
|
||||
positionTypeName: string
|
||||
@Column()
|
||||
positionLineName: string
|
||||
@Column()
|
||||
orgRootName: string
|
||||
@Column()
|
||||
organization: string
|
||||
@Column()
|
||||
idcard: string
|
||||
}
|
||||
|
||||
export class PostPersonal {
|
||||
id: string;
|
||||
prefix: string;
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
isProbation: boolean;
|
||||
posTypeName?: string | null;
|
||||
posLevelName: string | null;
|
||||
position: string | null;
|
||||
posLineName?: string | null;
|
||||
posNo?: string | null;
|
||||
organization?: string;
|
||||
orgRootName: string | null;
|
||||
orgChild1Name?: string | null;
|
||||
orgChild2Name?: string | null;
|
||||
orgChild3Name?: string | null;
|
||||
orgChild4Name?: string | null;
|
||||
id: string
|
||||
prefix: string
|
||||
firstName: string
|
||||
lastName: string
|
||||
isProbation: boolean
|
||||
posTypeName?: string | null
|
||||
posLevelName: string | null
|
||||
position: string | null
|
||||
posLineName?: string | null
|
||||
posNo?: string | null
|
||||
organization?: string
|
||||
orgRootName: string | null
|
||||
orgChild1Name?: string | null
|
||||
orgChild2Name?: string | null
|
||||
orgChild3Name?: string | null
|
||||
orgChild4Name?: string | null
|
||||
|
||||
order_number?: string;
|
||||
rank?: string | null;
|
||||
idcard?: string;
|
||||
positionField?: string | null;
|
||||
positionArea?: string | null;
|
||||
posExecutiveName?: string | null;
|
||||
positionExecutiveField?: string | null;
|
||||
order_number?: string
|
||||
rank?: string | null
|
||||
idcard?: string
|
||||
positionField?: string | null
|
||||
positionArea?: string | null
|
||||
posExecutiveName?: string | null
|
||||
positionExecutiveField?: string | null
|
||||
|
||||
root?: string | null;
|
||||
child1?: string | null;
|
||||
child2?: string | null;
|
||||
child3?: string | null;
|
||||
child4?: string | null;
|
||||
root?: string | null
|
||||
child1?: string | null
|
||||
child2?: string | null
|
||||
child3?: string | null
|
||||
child4?: string | null
|
||||
}
|
||||
|
||||
export type UpdatePersonal = Partial<CreatePersonal>;
|
||||
export type UpdatePersonal = Partial<CreatePersonal>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue