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

Merge branch 'develop' of github.com:Frappet/bma-ehr-kpi into develop

Browse source
This commit is contained in:
Kittapath 2024-04-22 15:52:07 +07:00
commit b671316601
3 changed files with 61 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/controllers/KpiUserEvaluationController.ts
View file

@ -69,6 +69,8 @@ export class KpiUserEvaluationController extends Controller {
kpiUserEvaluation.lastName = x.lastName
})
.catch((x) => {});
kpiUserEvaluation.evaluationStatus = requestBody.evaluationStatus
kpiUserEvaluation.evaluationResults = requestBody.evaluationResults
kpiUserEvaluation.createdUserId = request.user.sub;
kpiUserEvaluation.createdFullName = request.user.name;
kpiUserEvaluation.lastUpdateUserId = request.user.sub;
@ -111,6 +113,8 @@ export class KpiUserEvaluationController extends Controller {
}
if (kpiUserEvaluation) {
kpiUserEvaluation.evaluationStatus = requestBody.evaluationStatus
kpiUserEvaluation.evaluationResults = requestBody.evaluationResults
kpiUserEvaluation.lastUpdateUserId = request.user.sub;
kpiUserEvaluation.lastUpdateFullName = request.user.name;
this.kpiUserEvalutionRepository.merge(kpiUserEvaluation, requestBody);
@ -130,7 +134,7 @@ export class KpiUserEvaluationController extends Controller {
async GetKpiUserEvaluationById(@Path() id: string) {
const KpiUserEvaluation = await this.kpiUserEvalutionRepository.findOne({
where: { id: id },
select: ["id", "profileId", "prefix", "firstName", "lastName", "kpiPeriodId"],
select: ["id", "profileId", "prefix", "firstName", "lastName", "kpiPeriodId", "evaluationStatus", "evaluationResults", "createdAt"],
})
if (!KpiUserEvaluation) {
throw new HttpError(
@ -151,23 +155,23 @@ export class KpiUserEvaluationController extends Controller {
async listKpiUserEvaluation(
@Query("page") page: number = 1,
@Query("pageSize") pageSize: number = 10,
@Query("period") period?: string,
@Query("keyword") keyword?: string,
@Query("kpiPeriodId") kpiPeriodId?: string,
// @Query("keyword") keyword?: string,
) {
const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
.createQueryBuilder("kpiUserEvaluation")
.leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
.andWhere(
keyword == undefined
? "1=1"
: [
{ prefix: Like(`%${keyword}%`) },
{ firstName: Like(`%${keyword}%`) },
{ lastName: Like(`%${keyword}%`) },
],
)
.andWhere(period ? "kpiPeriod.durationKPI LIKE :period" : "1=1", { period: `%${period}%` })
// .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
// .andWhere(
// keyword == undefined
// ? "1=1"
// : [
// { prefix: Like(`%${keyword}%`) },
// { firstName: Like(`%${keyword}%`) },
// { lastName: Like(`%${keyword}%`) },
// ],
// )
.andWhere(kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", { kpiPeriodId: `%${kpiPeriodId}%` })
.orderBy("kpiUserEvaluation.createdAt", "ASC")
.skip((page - 1) * pageSize)
.take(pageSize)
@ -180,6 +184,9 @@ export class KpiUserEvaluationController extends Controller {
firstname: item.firstName,
lastname: item.lastName,
kpiPeriodId: item.kpiPeriodId,
evaluationStatus: item.evaluationStatus,
evaluationResults: item.evaluationResults,
createdAt: item.createdAt,
}));
return new HttpSuccess({ data: mapData, total });
}

24
src/entities/kpiUserEvaluation.ts
View file

@ -51,6 +51,22 @@ export class KpiUserEvaluation extends EntityBase {
})
profileId: string;
@Column({ // PENDING = รอการประเมิน , INPROGRESS = กําลังประเมิน , DONE = ประเมินเสร็จสิ้น
nullable: true,
length: 40,
comment: "สถานะการประเมินผล",
default: null,
})
evaluationStatus: string;
@Column({ // PASSED = ผ่านการประเมิน , NOTPASSED = ไม่ผ่านการประเมิน
nullable: true,
length: 40,
comment: "ผลการประเมิน",
default: null,
})
evaluationResults: string;
@ManyToOne(() => KpiPeriod, (kpiPeriod) => kpiPeriod.kpiUserEvaluation)
@JoinColumn({ name: "kpiPeriodId" })
kpiPeriod: KpiPeriod;
@ -91,6 +107,10 @@ export class createKpiUserEvaluation {
kpiPeriodId: string;
@Column()
profileId: string;
@Column()
evaluationStatus: string;
@Column()
evaluationResults: string;
}
export class updateKpiUserEvaluation {
@ -104,4 +124,8 @@ export class updateKpiUserEvaluation {
kpiPeriodId: string;
@Column()
profileId: string;
@Column()
evaluationStatus: string;
@Column()
evaluationResults: string;
}

16
src/migration/1713774054952-add_fields_table_userEvaluation.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class AddFieldsTableUserEvaluation1713774054952 implements MigrationInterface {
name = 'AddFieldsTableUserEvaluation1713774054952'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` ADD \`evaluationStatus\` varchar(40) NULL COMMENT 'สถานะการประเมินผล'`);
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` ADD \`evaluationResults\` varchar(40) NULL COMMENT 'ผลการประเมิน'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` DROP COLUMN \`evaluationResults\``);
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` DROP COLUMN \`evaluationStatus\``);
}
}