hrms-bangkok/hrms-api-kpi
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้ค่า default

Browse source
This commit is contained in:
Kittapath 2024-05-09 11:25:08 +07:00
parent 5d9e731947
commit 3bfd309ae8
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/KpiUserEvaluationController.ts
View file

@ -240,7 +240,7 @@ export class KpiUserEvaluationController extends Controller {
@Get("{id}")
async GetKpiUserEvaluationById(@Path() id: string) {
const kpiUserEvaluation = await this.kpiUserEvalutionRepository.findOne({
relations:["kpiPeriod"],
relations: ["kpiPeriod"],
where: { id: id },
});
if (!kpiUserEvaluation) {
@ -257,6 +257,7 @@ export class KpiUserEvaluationController extends Controller {
lastName: kpiUserEvaluation.lastName,
evaluationStatus: kpiUserEvaluation.evaluationStatus,
evaluationResults: kpiUserEvaluation.evaluationResults,
evaluationReqEdit: kpiUserEvaluation.evaluationReqEdit,
createdAt: kpiUserEvaluation.createdAt,
evaluatorId: kpiUserEvaluation.evaluatorId,
commanderId: kpiUserEvaluation.commanderId,
@ -267,8 +268,9 @@ export class KpiUserEvaluationController extends Controller {
capacityPoint: kpiUserEvaluation.capacityPoint,
kpiPeriodId: kpiUserEvaluation.kpiPeriodId,
year: kpiUserEvaluation.kpiPeriod == null ? null : kpiUserEvaluation.kpiPeriod.year,
durationKPI: kpiUserEvaluation.kpiPeriod == null ? null : kpiUserEvaluation.kpiPeriod.durationKPI,
}
durationKPI:
kpiUserEvaluation.kpiPeriod == null ? null : kpiUserEvaluation.kpiPeriod.durationKPI,
};
return new HttpSuccess(mapData);
}
@ -289,7 +291,7 @@ export class KpiUserEvaluationController extends Controller {
) {
const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
.createQueryBuilder("kpiUserEvaluation")
.leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
.leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
.andWhere(kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", {
kpiPeriodId: kpiPeriodId,
})

4
src/entities/kpiUserEvaluation.ts
View file

@ -80,7 +80,7 @@ export class KpiUserEvaluation extends EntityBase {
length: 40,
comment:
"ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน",
default: null,
default: "PENDING",
})
evaluationResults: string;
@ -88,7 +88,7 @@ export class KpiUserEvaluation extends EntityBase {
nullable: true,
length: 40,
comment: "คำขอแก้ไข",
default: null,
default: "NEW",
})
evaluationReqEdit: string;

16
src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableKpiUserEvaluationAddEvaluationReqEdit11715228658780 implements MigrationInterface {
name = 'UpdateTableKpiUserEvaluationAddEvaluationReqEdit11715228658780'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationResults\` \`evaluationResults\` varchar(40) NULL COMMENT 'ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน' DEFAULT 'PENDING'`);
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationReqEdit\` \`evaluationReqEdit\` varchar(40) NULL COMMENT 'คำขอแก้ไข' DEFAULT 'NEW'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationReqEdit\` \`evaluationReqEdit\` varchar(40) NULL COMMENT 'คำขอแก้ไข'`);
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationResults\` \`evaluationResults\` varchar(40) NULL COMMENT 'ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน'`);
}
}