From 896928d3c7e45be096885de678ecd0df6cffe0cf Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Thu, 13 Feb 2025 18:43:36 +0700 Subject: [PATCH] update --- src/controllers/ReportController.ts | 60 +++++++++---------- src/entities/view/viewDevScholarship.ts | 2 + ...739446719623-update_viewDevScholarship.ts} | 12 ++-- 3 files changed, 37 insertions(+), 37 deletions(-) rename src/migration/{1739443292907-updateView.ts => 1739446719623-update_viewDevScholarship.ts} (51%) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 8e44261..2790f38 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -9,7 +9,7 @@ import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; import Extension from "../interfaces/extension"; import { DevelopmentScholarship } from "../entities/DevelopmentScholarship"; -import { IsNull, Not } from "typeorm"; +import { In, IsNull, Not } from "typeorm"; import { viewDevScholarship } from "../entities/view/viewDevScholarship"; @Route("api/v1/development/report") @Tags("Report") @@ -742,30 +742,30 @@ export class ReportController extends Controller { data: { year: year ? Extension.ToThaiNumber((year+543).toString()) : "-", data: Array.isArray(_group) - ? _group - // ? _group.map((x:any) => ({ - // no: x.no ? Extension.ToThaiNumber(x.no) : "-", - // root: x.root ? x.root : "-", - // Bachelor : "-", - // BachelorHight: "-", - // Master: "-", - // Doctor: "-", - // DomesticeCourseCount: x.DomesticeCourseCount ? Extension.ToThaiNumber(x.DomesticeCourseCount) : "-", - // DomesticeProfileCount: x.DomesticeProfileCount ? Extension.ToThaiNumber(x.DomesticeProfileCount) : "-", - // DomesticeBudgetApprove: x.DomesticeBudgetApprove ? Extension.ToThaiNumber(x.DomesticeBudgetApprove) : "-", - // NoAbroadCourseCount: x.NoAbroadCourseCount ? Extension.ToThaiNumber(x.NoAbroadCourseCount) : "-", - // NoAbroadDProfileCount: x.NoAbroadDProfileCount ? Extension.ToThaiNumber(x.NoAbroadDProfileCount) : "-", - // NoAbroadBudgetApprove: x.NoAbroadBudgetApprove ? Extension.ToThaiNumber(x.NoAbroadBudgetApprove) : "-", - // AbroadCourseCount: x.AbroadCourseCount ? Extension.ToThaiNumber(x.AbroadCourseCount) : "-", - // AbroadProfileCount: x.AbroadProfileCount ? Extension.ToThaiNumber(x.AbroadProfileCount) : "-", - // AbroadBudgetApprove: x.AbroadBudgetApprove ? Extension.ToThaiNumber(x.AbroadBudgetApprove) : "-", - // ExecutiveCourseCount: x.ExecutiveCourseCount ? Extension.ToThaiNumber(x.ExecutiveCourseCount) : "-", - // ExecutiveProfileCount: x.ExecutiveProfileCount ? Extension.ToThaiNumber(x.ExecutiveProfileCount) : "-", - // ExecutiveBudgetApprove: x.ExecutiveBudgetApprove ? Extension.ToThaiNumber(x.ExecutiveBudgetApprove) : "-", - // TotalCourseCount: x.TotalCourseCount ? Extension.ToThaiNumber(x.TotalCourseCount) : "-", - // TotalProfileCount: x.TotalProfileCount ? Extension.ToThaiNumber(x.TotalProfileCount) : "-", - // TotalBudgetApprove: x.TotalBudgetApprove ? Extension.ToThaiNumber(x.TotalBudgetApprove) : "-", - // })) + // ? _group + ? _group.map((x:any) => ({ + no: x.no ? Extension.ToThaiNumber(x.no.toString()) : "-", + root: x.root ? x.root : "-", + Bachelor : "-", + BachelorHight: "-", + Master: "-", + Doctor: "-", + DomesticeCourseCount: x.DomesticeCourseCount ? Extension.ToThaiNumber(x.DomesticeCourseCount.toLocaleString()) : "-", + DomesticeProfileCount: x.DomesticeProfileCount ? Extension.ToThaiNumber(x.DomesticeProfileCount.toLocaleString()) : "-", + DomesticeBudgetApprove: x.DomesticeBudgetApprove ? Extension.ToThaiNumber(x.DomesticeBudgetApprove.toLocaleString()) : "-", + NoAbroadCourseCount: x.NoAbroadCourseCount ? Extension.ToThaiNumber(x.NoAbroadCourseCount.toLocaleString()) : "-", + NoAbroadDProfileCount: x.NoAbroadDProfileCount ? Extension.ToThaiNumber(x.NoAbroadDProfileCount.toLocaleString()) : "-", + NoAbroadBudgetApprove: x.NoAbroadBudgetApprove ? Extension.ToThaiNumber(x.NoAbroadBudgetApprove.toLocaleString()) : "-", + AbroadCourseCount: x.AbroadCourseCount ? Extension.ToThaiNumber(x.AbroadCourseCount.toLocaleString()) : "-", + AbroadProfileCount: x.AbroadProfileCount ? Extension.ToThaiNumber(x.AbroadProfileCount.toLocaleString()) : "-", + AbroadBudgetApprove: x.AbroadBudgetApprove ? Extension.ToThaiNumber(x.AbroadBudgetApprove.toLocaleString()) : "-", + ExecutiveCourseCount: x.ExecutiveCourseCount ? Extension.ToThaiNumber(x.ExecutiveCourseCount.toLocaleString()) : "-", + ExecutiveProfileCount: x.ExecutiveProfileCount ? Extension.ToThaiNumber(x.ExecutiveProfileCount.toLocaleString()) : "-", + ExecutiveBudgetApprove: x.ExecutiveBudgetApprove ? Extension.ToThaiNumber(x.ExecutiveBudgetApprove.toLocaleString()) : "-", + TotalCourseCount: x.TotalCourseCount ? Extension.ToThaiNumber(x.TotalCourseCount.toLocaleString()) : "-", + TotalProfileCount: x.TotalProfileCount ? Extension.ToThaiNumber(x.TotalProfileCount.toLocaleString()) : "-", + TotalBudgetApprove: x.TotalBudgetApprove ? Extension.ToThaiNumber(x.TotalBudgetApprove.toLocaleString()) : "-", + })) : [{ no: "-", root: "-", @@ -856,7 +856,7 @@ export class ReportController extends Controller { place: item.studyPlace ? item.studyPlace : "-", country: item.studyCountry ? item.studyCountry : "-", startAndendDate: dateDulation, - budgetApprove: item.budgetApprove ? Extension.ToThaiNumber(item.budgetApprove.toString()) : "-", + budgetApprove: item.budgetApprove ? Extension.ToThaiNumber(item.budgetApprove.toLocaleString()) : "-", }; }); @@ -867,8 +867,8 @@ export class ReportController extends Controller { data: { year: year?Extension.ToThaiNumber((year+543).toString()):"", data: formattedData, - total: Extension.ToThaiNumber(total.toString()), - totalBudgetApprove: Extension.ToThaiNumber(totalBudgetApprove.toString()), + total: Extension.ToThaiNumber(total.toLocaleString()), + totalBudgetApprove: Extension.ToThaiNumber(totalBudgetApprove.toLocaleString()), }, }); } @@ -893,9 +893,7 @@ export class ReportController extends Controller { ]; // const development = await this.viewDevScholarship.find({ - // where:{ - // degreeLevel: In(degree), - // } + // }) diff --git a/src/entities/view/viewDevScholarship.ts b/src/entities/view/viewDevScholarship.ts index e85ef4e..5d3ea65 100644 --- a/src/entities/view/viewDevScholarship.ts +++ b/src/entities/view/viewDevScholarship.ts @@ -17,6 +17,8 @@ export class viewDevScholarship { @ViewColumn() root: string; @ViewColumn() + degreeLevel: string; + @ViewColumn() numberOfRecords: number; @ViewColumn() numberOfScholarshipTypes: number; diff --git a/src/migration/1739443292907-updateView.ts b/src/migration/1739446719623-update_viewDevScholarship.ts similarity index 51% rename from src/migration/1739443292907-updateView.ts rename to src/migration/1739446719623-update_viewDevScholarship.ts index abfef72..9a1acbc 100644 --- a/src/migration/1739443292907-updateView.ts +++ b/src/migration/1739446719623-update_viewDevScholarship.ts @@ -1,10 +1,10 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -export class UpdateView1739443292907 implements MigrationInterface { - name = 'UpdateView1739443292907' +export class UpdateViewDevScholarship1739446719623 implements MigrationInterface { + name = 'UpdateViewDevScholarship1739446719623' public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`CREATE VIEW \`view_profile_evaluation\` AS SELECT MAX(\`rootId\`) AS rootId, + await queryRunner.query(`CREATE VIEW \`view_dev_scholarship\` AS SELECT MAX(\`rootId\`) AS rootId, MAX(\`root\`) AS root,\`degreeLevel\`, COUNT(*) AS numberOfRecords, COUNT(DISTINCT \`scholarshipType\`) AS numberOfScholarshipTypes, @@ -12,12 +12,12 @@ export class UpdateView1739443292907 implements MigrationInterface { FROM \`developmentScholarship\` GROUP BY \`rootId\`,\`degreeLevel\` `); - await queryRunner.query(`INSERT INTO \`bma_ehr_development_demo\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["bma_ehr_development_demo","VIEW","view_profile_evaluation","SELECT MAX(`rootId`) AS rootId, \n MAX(`root`) AS root,`degreeLevel`,\n COUNT(*) AS numberOfRecords, \n COUNT(DISTINCT `scholarshipType`) AS numberOfScholarshipTypes,\n SUM(`budgetApprove`) AS totalBudgetApprove\n FROM `developmentScholarship`\n GROUP BY `rootId`,`degreeLevel`"]); + await queryRunner.query(`INSERT INTO \`bma_ehr_development_demo\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["bma_ehr_development_demo","VIEW","view_dev_scholarship","SELECT MAX(`rootId`) AS rootId, \n MAX(`root`) AS root,`degreeLevel`,\n COUNT(*) AS numberOfRecords, \n COUNT(DISTINCT `scholarshipType`) AS numberOfScholarshipTypes,\n SUM(`budgetApprove`) AS totalBudgetApprove\n FROM `developmentScholarship`\n GROUP BY `rootId`,`degreeLevel`"]); } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DELETE FROM \`bma_ehr_development_demo\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","view_profile_evaluation","bma_ehr_development_demo"]); - await queryRunner.query(`DROP VIEW \`view_profile_evaluation\``); + await queryRunner.query(`DELETE FROM \`bma_ehr_development_demo\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","view_dev_scholarship","bma_ehr_development_demo"]); + await queryRunner.query(`DROP VIEW \`view_dev_scholarship\``); } }