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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-09 11:42:11 +07:00
commit fe7dcd6815
8 changed files with 70 additions and 17 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,
})

3
src/controllers/KpiUserSpecialController.ts
View file

@ -238,6 +238,9 @@ export class KpiUserSpecialController extends Controller {
achievement3: getKpiUserSpecial.achievement3,
achievement4: getKpiUserSpecial.achievement4,
achievement5: getKpiUserSpecial.achievement5,
startDate: getKpiUserSpecial.startDate,
endDate: getKpiUserSpecial.endDate,
documentInfoEvidence: getKpiUserSpecial.documentInfoEvidence,
};
return new HttpSuccess(mapKpiUserSpecial);