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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 54s
Details

Browse source
This commit is contained in:
Adisak 2025-11-03 10:29:46 +07:00
commit 3c26bbe513
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ReportController.ts
View file

@ -572,7 +572,9 @@ export class ReportController extends Controller {
"AVG(kpiUserEvaluation.summaryPoint) as avgSummaryPoint" "AVG(kpiUserEvaluation.summaryPoint) as avgSummaryPoint"
]) ])
.getRawMany(); .getRawMany();
if(!profileEvaluationNowYearIds || profileEvaluationNowYearIds.length === 0){
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลรายงานการประเมินผลฯ ระดับบุคคลของบุคคลนี้");
}
// const profileEvaluations = await this.kpiUserEvaluationRepository.find({ // const profileEvaluations = await this.kpiUserEvaluationRepository.find({
// relations: ["kpiPeriod"], // relations: ["kpiPeriod"],
// where: { id: In(profileEvaluationNowYearIds.map((evaluation) => evaluation.id)) }, // where: { id: In(profileEvaluationNowYearIds.map((evaluation) => evaluation.id)) },
@ -1500,6 +1502,9 @@ export class ReportController extends Controller {
.groupBy("kpiUserEvaluation.kpiPeriodId") .groupBy("kpiUserEvaluation.kpiPeriodId")
.select("MIN(kpiUserEvaluation.id) as id") .select("MIN(kpiUserEvaluation.id) as id")
.getRawMany(); .getRawMany();
if(!profileEvaluationIds || profileEvaluationIds.length === 0){
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลรายงานการประเมินผลฯ ระดับบุคคลของบุคคลนี้");
}
if (profileEvaluationIds.length > 0) { if (profileEvaluationIds.length > 0) {
userInfo = await this.kpiUserEvaluationRepository.find({ userInfo = await this.kpiUserEvaluationRepository.find({
where: { where: {
@ -1532,7 +1537,6 @@ export class ReportController extends Controller {
const dev20text = "การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)"; const dev20text = "การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)";
const dev70text = "การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)"; const dev70text = "การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)";
const combianText = [dev10text, dev20text, dev70text]; const combianText = [dev10text, dev20text, dev70text];
formattedUserDevelopmentLists = userDevelopmentLists.map( formattedUserDevelopmentLists = userDevelopmentLists.map(
(development: any, index: number) => ({ (development: any, index: number) => ({
no: Extension.ToThaiNumber((index + 1).toString()), no: Extension.ToThaiNumber((index + 1).toString()),