no message
This commit is contained in:
parent
305fd51c99
commit
b3adb67e44
13 changed files with 497 additions and 121 deletions
|
|
@ -30,10 +30,6 @@ import {
|
||||||
} from "../entities/kpiUserEvaluation";
|
} from "../entities/kpiUserEvaluation";
|
||||||
import { Like, In, Brackets } from "typeorm";
|
import { Like, In, Brackets } from "typeorm";
|
||||||
import CallAPI from "../interfaces/call-api";
|
import CallAPI from "../interfaces/call-api";
|
||||||
import {
|
|
||||||
KpiUserEvaluationReason,
|
|
||||||
updateKpiUserReasonEvaluation,
|
|
||||||
} from "../entities/kpiUserEvaluationReason";
|
|
||||||
|
|
||||||
@Route("api/v1/kpi/user/evaluation")
|
@Route("api/v1/kpi/user/evaluation")
|
||||||
@Tags("kpiUserEvaluation")
|
@Tags("kpiUserEvaluation")
|
||||||
|
|
@ -46,7 +42,6 @@ import {
|
||||||
export class KpiUserEvaluationController extends Controller {
|
export class KpiUserEvaluationController extends Controller {
|
||||||
private kpiPeriodRepository = AppDataSource.getRepository(KpiPeriod);
|
private kpiPeriodRepository = AppDataSource.getRepository(KpiPeriod);
|
||||||
private kpiUserEvalutionRepository = AppDataSource.getRepository(KpiUserEvaluation);
|
private kpiUserEvalutionRepository = AppDataSource.getRepository(KpiUserEvaluation);
|
||||||
private kpiUserEvaluationReasonRepository = AppDataSource.getRepository(KpiUserEvaluationReason);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API
|
* API
|
||||||
|
|
@ -195,56 +190,56 @@ export class KpiUserEvaluationController extends Controller {
|
||||||
return new HttpSuccess(kpiUserEvaluation.id);
|
return new HttpSuccess(kpiUserEvaluation.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* API แก้ไขหมายเหตุ (USER)
|
// * API แก้ไขหมายเหตุ (USER)
|
||||||
*
|
// *
|
||||||
* @summary แก้ไขหมายเหตุ (USER)
|
// * @summary แก้ไขหมายเหตุ (USER)
|
||||||
*
|
// *
|
||||||
* @param {string} id Guid, *Id คนประเมิน (USER)
|
// * @param {string} id Guid, *Id คนประเมิน (USER)
|
||||||
*/
|
// */
|
||||||
@Put("{type}/{id}")
|
// @Put("{type}/{id}")
|
||||||
async updateKpiUserEvaluatorEvaluation(
|
// async updateKpiUserEvaluatorEvaluation(
|
||||||
@Path() id: string,
|
// @Path() id: string,
|
||||||
@Path() type: string,
|
// @Path() type: string,
|
||||||
@Body() requestBody: updateKpiUserReasonEvaluation,
|
// @Body() requestBody: updateKpiUserReasonEvaluation,
|
||||||
@Request() request: { user: Record<string, any> },
|
// @Request() request: { user: Record<string, any> },
|
||||||
) {
|
// ) {
|
||||||
const kpiUserEvaluation = await this.kpiUserEvalutionRepository.findOne({
|
// const kpiUserEvaluation = await this.kpiUserEvalutionRepository.findOne({
|
||||||
where: { id: id },
|
// where: { id: id },
|
||||||
});
|
// });
|
||||||
if (!kpiUserEvaluation) {
|
// if (!kpiUserEvaluation) {
|
||||||
throw new HttpError(
|
// throw new HttpError(
|
||||||
HttpStatusCode.NOT_FOUND,
|
// HttpStatusCode.NOT_FOUND,
|
||||||
"ไม่พบข้อมูลรายการประเมินผลการปฏิบัติราชการระดับบุคคลนี้",
|
// "ไม่พบข้อมูลรายการประเมินผลการปฏิบัติราชการระดับบุคคลนี้",
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
|
|
||||||
const kpiUserEvaluationReason = Object.assign(new KpiUserEvaluationReason(), requestBody);
|
// const kpiUserEvaluationReason = Object.assign(new KpiUserEvaluationReason(), requestBody);
|
||||||
kpiUserEvaluationReason.type = type.trim().toUpperCase();
|
// kpiUserEvaluationReason.type = type.trim().toUpperCase();
|
||||||
kpiUserEvaluationReason.kpiUserEvaluationId = id;
|
// kpiUserEvaluationReason.kpiUserEvaluationId = id;
|
||||||
kpiUserEvaluationReason.createdUserId = request.user.sub;
|
// kpiUserEvaluationReason.createdUserId = request.user.sub;
|
||||||
kpiUserEvaluationReason.createdFullName = request.user.name;
|
// kpiUserEvaluationReason.createdFullName = request.user.name;
|
||||||
kpiUserEvaluationReason.lastUpdateUserId = request.user.sub;
|
// kpiUserEvaluationReason.lastUpdateUserId = request.user.sub;
|
||||||
kpiUserEvaluationReason.lastUpdateFullName = request.user.name;
|
// kpiUserEvaluationReason.lastUpdateFullName = request.user.name;
|
||||||
await this.kpiUserEvaluationReasonRepository.save(kpiUserEvaluationReason);
|
// await this.kpiUserEvaluationReasonRepository.save(kpiUserEvaluationReason);
|
||||||
return new HttpSuccess(kpiUserEvaluation.id);
|
// return new HttpSuccess(kpiUserEvaluation.id);
|
||||||
}
|
// }
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* API list หมายเหตุ (USER)
|
// * API list หมายเหตุ (USER)
|
||||||
*
|
// *
|
||||||
* @summary list หมายเหตุ (USER)
|
// * @summary list หมายเหตุ (USER)
|
||||||
*
|
// *
|
||||||
* @param {string} id Guid, *Id คนประเมิน (USER)
|
// * @param {string} id Guid, *Id คนประเมิน (USER)
|
||||||
*/
|
// */
|
||||||
@Get("{type}/{id}")
|
// @Get("{type}/{id}")
|
||||||
async listKpiUserCommanderEvaluation(@Path() id: string, @Path() type: string) {
|
// async listKpiUserCommanderEvaluation(@Path() id: string, @Path() type: string) {
|
||||||
const kpiUserEvaluationReason = await this.kpiUserEvaluationReasonRepository.find({
|
// const kpiUserEvaluationReason = await this.kpiUserEvaluationReasonRepository.find({
|
||||||
where: { kpiUserEvaluationId: id, type: type.trim().toUpperCase() },
|
// where: { kpiUserEvaluationId: id, type: type.trim().toUpperCase() },
|
||||||
order: { createdAt: "ASC" },
|
// order: { createdAt: "ASC" },
|
||||||
});
|
// });
|
||||||
return new HttpSuccess(kpiUserEvaluationReason);
|
// return new HttpSuccess(kpiUserEvaluationReason);
|
||||||
}
|
// }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API แก้ไขรายการประเมินผลการปฏิบัติราชการระดับบุคคล (USER)
|
* API แก้ไขรายการประเมินผลการปฏิบัติราชการระดับบุคคล (USER)
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm";
|
||||||
import { EntityBase } from "./base/Base";
|
import { EntityBase } from "./base/Base";
|
||||||
import { KpiCapacity } from "./kpiCapacity";
|
import { KpiCapacity } from "./kpiCapacity";
|
||||||
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
||||||
|
import { KpiUserEvaluationReasonCapacity } from "./kpiUserEvaluationReasonCapacity";
|
||||||
|
|
||||||
@Entity("kpiUserCapacity")
|
@Entity("kpiUserCapacity")
|
||||||
export class KpiUserCapacity extends EntityBase {
|
export class KpiUserCapacity extends EntityBase {
|
||||||
|
|
@ -57,9 +58,15 @@ export class KpiUserCapacity extends EntityBase {
|
||||||
@ManyToOne(() => KpiCapacity, (kpiCapacity) => kpiCapacity.kpiUserCapacitys)
|
@ManyToOne(() => KpiCapacity, (kpiCapacity) => kpiCapacity.kpiUserCapacitys)
|
||||||
@JoinColumn({ name: "kpiCapacityId" })
|
@JoinColumn({ name: "kpiCapacityId" })
|
||||||
kpiCapacity: KpiCapacity;
|
kpiCapacity: KpiCapacity;
|
||||||
|
|
||||||
|
@OneToMany(
|
||||||
|
() => KpiUserEvaluationReasonCapacity,
|
||||||
|
(kpiUserEvaluationReasonCapacity) => kpiUserEvaluationReasonCapacity.kpiUserCapacity,
|
||||||
|
)
|
||||||
|
kpiUserEvaluationReasonCapacitys: KpiUserEvaluationReasonCapacity[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class KpiUserCapacityDataPoint {
|
export class KpiUserCapacityDataPoint {
|
||||||
id: string;
|
id: string;
|
||||||
point: number;
|
point: number;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
|
||||||
import { EntityBase } from "./base/Base";
|
import { EntityBase } from "./base/Base";
|
||||||
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
||||||
|
import { KpiUserEvaluationReasonDevelopment } from "./kpiUserEvaluationReasonDevelopment";
|
||||||
|
|
||||||
@Entity("kpiUserDevelopment")
|
@Entity("kpiUserDevelopment")
|
||||||
export class KpiUserDevelopment extends EntityBase {
|
export class KpiUserDevelopment extends EntityBase {
|
||||||
|
|
@ -76,6 +77,12 @@ export class KpiUserDevelopment extends EntityBase {
|
||||||
@ManyToOne(() => KpiUserEvaluation, (kpiUserEvaluation) => kpiUserEvaluation.kpiUserDevelopments)
|
@ManyToOne(() => KpiUserEvaluation, (kpiUserEvaluation) => kpiUserEvaluation.kpiUserDevelopments)
|
||||||
@JoinColumn({ name: "kpiUserEvaluationId" })
|
@JoinColumn({ name: "kpiUserEvaluationId" })
|
||||||
kpiUserEvaluation: KpiUserEvaluation;
|
kpiUserEvaluation: KpiUserEvaluation;
|
||||||
|
|
||||||
|
@OneToMany(
|
||||||
|
() => KpiUserEvaluationReasonDevelopment,
|
||||||
|
(kpiUserEvaluationReasonDevelopment) => kpiUserEvaluationReasonDevelopment.kpiUserDevelopment,
|
||||||
|
)
|
||||||
|
kpiUserEvaluationReasonDevelopments: KpiUserEvaluationReasonDevelopment[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CreateKpiUserDevelopment {
|
export class CreateKpiUserDevelopment {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import { KpiUserSpecial } from "./kpiUserSpecial";
|
||||||
import { KpiUserRole } from "./kpiUserRole";
|
import { KpiUserRole } from "./kpiUserRole";
|
||||||
import { KpiUserPlanned } from "./kpiUserPlanned";
|
import { KpiUserPlanned } from "./kpiUserPlanned";
|
||||||
import { KpiUserCapacity } from "./kpiUserCapacity";
|
import { KpiUserCapacity } from "./kpiUserCapacity";
|
||||||
import { KpiUserEvaluationReason } from "./kpiUserEvaluationReason";
|
|
||||||
import { KpiUserDevelopment } from "./kpiUserDevelopment";
|
import { KpiUserDevelopment } from "./kpiUserDevelopment";
|
||||||
@Entity("kpiUserEvaluation")
|
@Entity("kpiUserEvaluation")
|
||||||
export class KpiUserEvaluation extends EntityBase {
|
export class KpiUserEvaluation extends EntityBase {
|
||||||
|
|
@ -149,12 +148,6 @@ export class KpiUserEvaluation extends EntityBase {
|
||||||
|
|
||||||
@OneToMany(() => KpiUserDevelopment, (kpiUserDevelopment) => kpiUserDevelopment.kpiUserEvaluation)
|
@OneToMany(() => KpiUserDevelopment, (kpiUserDevelopment) => kpiUserDevelopment.kpiUserEvaluation)
|
||||||
kpiUserDevelopments: KpiUserDevelopment[];
|
kpiUserDevelopments: KpiUserDevelopment[];
|
||||||
|
|
||||||
@OneToMany(
|
|
||||||
() => KpiUserEvaluationReason,
|
|
||||||
(kpiUserEvaluationReason) => kpiUserEvaluationReason.kpiUserEvaluation,
|
|
||||||
)
|
|
||||||
kpiUserEvaluationReasons: KpiUserEvaluationReason[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export class createKpiUserEvaluation {
|
export class createKpiUserEvaluation {
|
||||||
|
|
|
||||||
|
|
@ -1,56 +0,0 @@
|
||||||
import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm";
|
|
||||||
import { EntityBase } from "./base/Base";
|
|
||||||
import { KpiPeriod } from "./kpiPeriod";
|
|
||||||
import { KpiUserSpecial } from "./kpiUserSpecial";
|
|
||||||
import { KpiUserRole } from "./kpiUserRole";
|
|
||||||
import { KpiUserPlanned } from "./kpiUserPlanned";
|
|
||||||
import { KpiUserCapacity } from "./kpiUserCapacity";
|
|
||||||
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
|
||||||
@Entity("kpiUserEvaluationReason")
|
|
||||||
export class KpiUserEvaluationReason extends EntityBase {
|
|
||||||
@Column({
|
|
||||||
nullable: true,
|
|
||||||
comment: "หมายเหตุ",
|
|
||||||
length: 255,
|
|
||||||
default: null,
|
|
||||||
})
|
|
||||||
reason: string;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
nullable: true,
|
|
||||||
comment: "หัวข้อ",
|
|
||||||
length: 255,
|
|
||||||
default: null,
|
|
||||||
})
|
|
||||||
topic: string;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
nullable: true,
|
|
||||||
comment: "ประเภท",
|
|
||||||
length: 255,
|
|
||||||
default: null,
|
|
||||||
})
|
|
||||||
type: string;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
nullable: true,
|
|
||||||
length: 40,
|
|
||||||
comment: "คีย์นอก(FK)ของตาราง kpiPeriodId",
|
|
||||||
default: null,
|
|
||||||
})
|
|
||||||
kpiUserEvaluationId: string;
|
|
||||||
|
|
||||||
@ManyToOne(
|
|
||||||
() => KpiUserEvaluation,
|
|
||||||
(kpiUserEvaluation) => kpiUserEvaluation.kpiUserEvaluationReasons,
|
|
||||||
)
|
|
||||||
@JoinColumn({ name: "kpiUserEvaluationId" })
|
|
||||||
kpiUserEvaluation: KpiUserEvaluation;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class updateKpiUserReasonEvaluation {
|
|
||||||
@Column()
|
|
||||||
reason: string | null;
|
|
||||||
@Column()
|
|
||||||
topic: string | null;
|
|
||||||
}
|
|
||||||
83
src/entities/kpiUserEvaluationReasonCapacity.ts
Normal file
83
src/entities/kpiUserEvaluationReasonCapacity.ts
Normal file
|
|
@ -0,0 +1,83 @@
|
||||||
|
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
||||||
|
import { EntityBase } from "./base/Base";
|
||||||
|
import { KpiUserCapacity } from "./kpiUserCapacity";
|
||||||
|
@Entity("kpiUserEvaluationReasonCapacity")
|
||||||
|
export class KpiUserEvaluationReasonCapacity extends EntityBase {
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หัวข้อ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
topic: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reason: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้ประเมิน",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonEvaluator: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไป",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommander: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommanderHigh: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "สถานะ DRAFT EVALUATOR COMMANDER COMMANDERHIGH",
|
||||||
|
length: 255,
|
||||||
|
default: "DRAFT",
|
||||||
|
})
|
||||||
|
status: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "ประเภท PROGRESS PROBLEM",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
type: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
length: 40,
|
||||||
|
comment: "คีย์นอก(FK)ของตาราง kpiUserCapacity",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
kpiUserCapacityId: string;
|
||||||
|
|
||||||
|
@ManyToOne(
|
||||||
|
() => KpiUserCapacity,
|
||||||
|
(kpiUserCapacity) => kpiUserCapacity.kpiUserEvaluationReasonCapacitys,
|
||||||
|
)
|
||||||
|
@JoinColumn({ name: "kpiUserCapacityId" })
|
||||||
|
kpiUserCapacity: KpiUserCapacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class updateKpiUserReasonEvaluation {
|
||||||
|
@Column()
|
||||||
|
reason: string | null;
|
||||||
|
@Column()
|
||||||
|
topic: string | null;
|
||||||
|
}
|
||||||
83
src/entities/kpiUserEvaluationReasonDevelopment.ts
Normal file
83
src/entities/kpiUserEvaluationReasonDevelopment.ts
Normal file
|
|
@ -0,0 +1,83 @@
|
||||||
|
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
||||||
|
import { EntityBase } from "./base/Base";
|
||||||
|
import { KpiUserDevelopment } from "./kpiUserDevelopment";
|
||||||
|
@Entity("kpiUserEvaluationReasonDevelopment")
|
||||||
|
export class KpiUserEvaluationReasonDevelopment extends EntityBase {
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หัวข้อ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
topic: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reason: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้ประเมิน",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonEvaluator: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไป",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommander: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommanderHigh: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "สถานะ DRAFT EVALUATOR COMMANDER COMMANDERHIGH",
|
||||||
|
length: 255,
|
||||||
|
default: "DRAFT",
|
||||||
|
})
|
||||||
|
status: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "ประเภท PROGRESS PROBLEM",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
type: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
length: 40,
|
||||||
|
comment: "คีย์นอก(FK)ของตาราง kpiUserDevelopment",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
kpiUserDevelopmentId: string;
|
||||||
|
|
||||||
|
@ManyToOne(
|
||||||
|
() => KpiUserDevelopment,
|
||||||
|
(kpiUserDevelopment) => kpiUserDevelopment.kpiUserEvaluationReasonDevelopments,
|
||||||
|
)
|
||||||
|
@JoinColumn({ name: "kpiUserDevelopmentId" })
|
||||||
|
kpiUserDevelopment: KpiUserDevelopment;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class updateKpiUserReasonEvaluation {
|
||||||
|
@Column()
|
||||||
|
reason: string | null;
|
||||||
|
@Column()
|
||||||
|
topic: string | null;
|
||||||
|
}
|
||||||
80
src/entities/kpiUserEvaluationReasonPlan.ts
Normal file
80
src/entities/kpiUserEvaluationReasonPlan.ts
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
||||||
|
import { EntityBase } from "./base/Base";
|
||||||
|
import { KpiUserPlanned } from "./kpiUserPlanned";
|
||||||
|
@Entity("kpiUserEvaluationReasonPlan")
|
||||||
|
export class KpiUserEvaluationReasonPlan extends EntityBase {
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หัวข้อ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
topic: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reason: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้ประเมิน",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonEvaluator: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไป",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommander: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommanderHigh: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "สถานะ DRAFT EVALUATOR COMMANDER COMMANDERHIGH",
|
||||||
|
length: 255,
|
||||||
|
default: "DRAFT",
|
||||||
|
})
|
||||||
|
status: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "ประเภท PROGRESS PROBLEM",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
type: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
length: 40,
|
||||||
|
comment: "คีย์นอก(FK)ของตาราง kpiUserPlan",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
kpiUserPlannedId: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => KpiUserPlanned, (kpiUserPlanned) => kpiUserPlanned.kpiUserEvaluationReasonPlans)
|
||||||
|
@JoinColumn({ name: "kpiUserPlanId" })
|
||||||
|
kpiUserPlanned: KpiUserPlanned;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class updateKpiUserReasonEvaluation {
|
||||||
|
@Column()
|
||||||
|
reason: string | null;
|
||||||
|
@Column()
|
||||||
|
topic: string | null;
|
||||||
|
}
|
||||||
80
src/entities/kpiUserEvaluationReasonRole.ts
Normal file
80
src/entities/kpiUserEvaluationReasonRole.ts
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
||||||
|
import { EntityBase } from "./base/Base";
|
||||||
|
import { KpiUserRole } from "./kpiUserRole";
|
||||||
|
@Entity("kpiUserEvaluationReasonRole")
|
||||||
|
export class KpiUserEvaluationReasonRole extends EntityBase {
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หัวข้อ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
topic: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reason: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้ประเมิน",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonEvaluator: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไป",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommander: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommanderHigh: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "สถานะ DRAFT EVALUATOR COMMANDER COMMANDERHIGH",
|
||||||
|
length: 255,
|
||||||
|
default: "DRAFT",
|
||||||
|
})
|
||||||
|
status: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "ประเภท PROGRESS PROBLEM",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
type: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
length: 40,
|
||||||
|
comment: "คีย์นอก(FK)ของตาราง kpiUserRole",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
kpiUserRoleId: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => KpiUserRole, (kpiUserRole) => kpiUserRole.kpiUserEvaluationReasonRoles)
|
||||||
|
@JoinColumn({ name: "kpiUserRoleId" })
|
||||||
|
kpiUserRole: KpiUserRole;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class updateKpiUserReasonEvaluation {
|
||||||
|
@Column()
|
||||||
|
reason: string | null;
|
||||||
|
@Column()
|
||||||
|
topic: string | null;
|
||||||
|
}
|
||||||
83
src/entities/kpiUserEvaluationReasonSpecial.ts
Normal file
83
src/entities/kpiUserEvaluationReasonSpecial.ts
Normal file
|
|
@ -0,0 +1,83 @@
|
||||||
|
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
||||||
|
import { EntityBase } from "./base/Base";
|
||||||
|
import { KpiUserSpecial } from "./kpiUserSpecial";
|
||||||
|
@Entity("kpiUserEvaluationReasonSpecial")
|
||||||
|
export class KpiUserEvaluationReasonSpecial extends EntityBase {
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หัวข้อ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
topic: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reason: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้ประเมิน",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonEvaluator: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไป",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommander: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "หมายเหตุ ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
reasonCommanderHigh: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "สถานะ DRAFT EVALUATOR COMMANDER COMMANDERHIGH",
|
||||||
|
length: 255,
|
||||||
|
default: "DRAFT",
|
||||||
|
})
|
||||||
|
status: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "ประเภท PROGRESS PROBLEM",
|
||||||
|
length: 255,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
type: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
length: 40,
|
||||||
|
comment: "คีย์นอก(FK)ของตาราง kpiUserSpecial",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
kpiUserSpecialId: string;
|
||||||
|
|
||||||
|
@ManyToOne(
|
||||||
|
() => KpiUserSpecial,
|
||||||
|
(kpiUserSpecial) => kpiUserSpecial.kpiUserEvaluationReasonSpecials,
|
||||||
|
)
|
||||||
|
@JoinColumn({ name: "kpiUserSpecialId" })
|
||||||
|
kpiUserSpecial: KpiUserSpecial;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class updateKpiUserReasonEvaluation {
|
||||||
|
@Column()
|
||||||
|
reason: string | null;
|
||||||
|
@Column()
|
||||||
|
topic: string | null;
|
||||||
|
}
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
|
||||||
import { EntityBase } from "./base/Base";
|
import { EntityBase } from "./base/Base";
|
||||||
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
||||||
import { KpiPlan } from "./kpiPlan";
|
import { KpiPlan } from "./kpiPlan";
|
||||||
|
import { KpiUserEvaluationReasonPlan } from "./kpiUserEvaluationReasonPlan";
|
||||||
|
|
||||||
@Entity("kpiUserPlanned")
|
@Entity("kpiUserPlanned")
|
||||||
export class KpiUserPlanned extends EntityBase {
|
export class KpiUserPlanned extends EntityBase {
|
||||||
|
|
@ -136,6 +137,12 @@ export class KpiUserPlanned extends EntityBase {
|
||||||
default: null,
|
default: null,
|
||||||
})
|
})
|
||||||
achievement5: string;
|
achievement5: string;
|
||||||
|
|
||||||
|
@OneToMany(
|
||||||
|
() => KpiUserEvaluationReasonPlan,
|
||||||
|
(kpiUserEvaluationReasonPlan) => kpiUserEvaluationReasonPlan.kpiUserPlanned,
|
||||||
|
)
|
||||||
|
kpiUserEvaluationReasonPlans: KpiUserEvaluationReasonPlan[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CreateKpiUserPlanned {
|
export class CreateKpiUserPlanned {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
|
||||||
import { EntityBase } from "./base/Base";
|
import { EntityBase } from "./base/Base";
|
||||||
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
||||||
import { KpiRole } from "./kpiRole";
|
import { KpiRole } from "./kpiRole";
|
||||||
import { Double } from "typeorm/browser";
|
import { Double } from "typeorm/browser";
|
||||||
|
import { KpiUserEvaluationReasonRole } from "./kpiUserEvaluationReasonRole";
|
||||||
|
|
||||||
@Entity("kpiUserRole")
|
@Entity("kpiUserRole")
|
||||||
export class KpiUserRole extends EntityBase {
|
export class KpiUserRole extends EntityBase {
|
||||||
|
|
@ -137,6 +138,12 @@ export class KpiUserRole extends EntityBase {
|
||||||
default: null,
|
default: null,
|
||||||
})
|
})
|
||||||
achievement5: string;
|
achievement5: string;
|
||||||
|
|
||||||
|
@OneToMany(
|
||||||
|
() => KpiUserEvaluationReasonRole,
|
||||||
|
(kpiUserEvaluationReasonRole) => kpiUserEvaluationReasonRole.kpiUserRole,
|
||||||
|
)
|
||||||
|
kpiUserEvaluationReasonRoles: KpiUserEvaluationReasonRole[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CreateKpiUserRole {
|
export class CreateKpiUserRole {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
|
import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
|
||||||
import { EntityBase } from "./base/Base";
|
import { EntityBase } from "./base/Base";
|
||||||
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
import { KpiUserEvaluation } from "./kpiUserEvaluation";
|
||||||
|
import { KpiUserEvaluationReasonSpecial } from "./kpiUserEvaluationReasonSpecial";
|
||||||
|
|
||||||
@Entity("kpiUserSpecial")
|
@Entity("kpiUserSpecial")
|
||||||
export class KpiUserSpecial extends EntityBase {
|
export class KpiUserSpecial extends EntityBase {
|
||||||
|
|
@ -158,6 +159,12 @@ export class KpiUserSpecial extends EntityBase {
|
||||||
@ManyToOne(() => KpiUserEvaluation, (kpiUserEvaluation) => kpiUserEvaluation.kpiUserSpecials)
|
@ManyToOne(() => KpiUserEvaluation, (kpiUserEvaluation) => kpiUserEvaluation.kpiUserSpecials)
|
||||||
@JoinColumn({ name: "kpiUserEvaluationId" })
|
@JoinColumn({ name: "kpiUserEvaluationId" })
|
||||||
kpiUserEvaluation: KpiUserEvaluation;
|
kpiUserEvaluation: KpiUserEvaluation;
|
||||||
|
|
||||||
|
@OneToMany(
|
||||||
|
() => KpiUserEvaluationReasonSpecial,
|
||||||
|
(kpiUserEvaluationReasonSpecial) => kpiUserEvaluationReasonSpecial.kpiUserSpecial,
|
||||||
|
)
|
||||||
|
kpiUserEvaluationReasonSpecials: KpiUserEvaluationReasonSpecial[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CreateKpiUserSpecial {
|
export class CreateKpiUserSpecial {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue