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

update

Browse source
This commit is contained in:
AdisakKanthawilang 2025-02-13 18:43:36 +07:00
parent 04e6b6fa7d
commit 896928d3c7
3 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/controllers/ReportController.ts
View file

@ -9,7 +9,7 @@ import { PosType } from "../entities/PosType";
import { PosLevel } from "../entities/PosLevel"; import { PosLevel } from "../entities/PosLevel";
import Extension from "../interfaces/extension"; import Extension from "../interfaces/extension";
import { DevelopmentScholarship } from "../entities/DevelopmentScholarship"; import { DevelopmentScholarship } from "../entities/DevelopmentScholarship";
import { IsNull, Not } from "typeorm"; import { In, IsNull, Not } from "typeorm";
import { viewDevScholarship } from "../entities/view/viewDevScholarship"; import { viewDevScholarship } from "../entities/view/viewDevScholarship";
@Route("api/v1/development/report") @Route("api/v1/development/report")
@Tags("Report") @Tags("Report")
@ -742,30 +742,30 @@ export class ReportController extends Controller {
data: { data: {
year: year ? Extension.ToThaiNumber((year+543).toString()) : "-", year: year ? Extension.ToThaiNumber((year+543).toString()) : "-",
data: Array.isArray(_group) data: Array.isArray(_group)
? _group // ? _group
// ? _group.map((x:any) => ({ ? _group.map((x:any) => ({
// no: x.no ? Extension.ToThaiNumber(x.no) : "-", no: x.no ? Extension.ToThaiNumber(x.no.toString()) : "-",
// root: x.root ? x.root : "-", root: x.root ? x.root : "-",
// Bachelor : "-", Bachelor : "-",
// BachelorHight: "-", BachelorHight: "-",
// Master: "-", Master: "-",
// Doctor: "-", Doctor: "-",
// DomesticeCourseCount: x.DomesticeCourseCount ? Extension.ToThaiNumber(x.DomesticeCourseCount) : "-", DomesticeCourseCount: x.DomesticeCourseCount ? Extension.ToThaiNumber(x.DomesticeCourseCount.toLocaleString()) : "-",
// DomesticeProfileCount: x.DomesticeProfileCount ? Extension.ToThaiNumber(x.DomesticeProfileCount) : "-", DomesticeProfileCount: x.DomesticeProfileCount ? Extension.ToThaiNumber(x.DomesticeProfileCount.toLocaleString()) : "-",
// DomesticeBudgetApprove: x.DomesticeBudgetApprove ? Extension.ToThaiNumber(x.DomesticeBudgetApprove) : "-", DomesticeBudgetApprove: x.DomesticeBudgetApprove ? Extension.ToThaiNumber(x.DomesticeBudgetApprove.toLocaleString()) : "-",
// NoAbroadCourseCount: x.NoAbroadCourseCount ? Extension.ToThaiNumber(x.NoAbroadCourseCount) : "-", NoAbroadCourseCount: x.NoAbroadCourseCount ? Extension.ToThaiNumber(x.NoAbroadCourseCount.toLocaleString()) : "-",
// NoAbroadDProfileCount: x.NoAbroadDProfileCount ? Extension.ToThaiNumber(x.NoAbroadDProfileCount) : "-", NoAbroadDProfileCount: x.NoAbroadDProfileCount ? Extension.ToThaiNumber(x.NoAbroadDProfileCount.toLocaleString()) : "-",
// NoAbroadBudgetApprove: x.NoAbroadBudgetApprove ? Extension.ToThaiNumber(x.NoAbroadBudgetApprove) : "-", NoAbroadBudgetApprove: x.NoAbroadBudgetApprove ? Extension.ToThaiNumber(x.NoAbroadBudgetApprove.toLocaleString()) : "-",
// AbroadCourseCount: x.AbroadCourseCount ? Extension.ToThaiNumber(x.AbroadCourseCount) : "-", AbroadCourseCount: x.AbroadCourseCount ? Extension.ToThaiNumber(x.AbroadCourseCount.toLocaleString()) : "-",
// AbroadProfileCount: x.AbroadProfileCount ? Extension.ToThaiNumber(x.AbroadProfileCount) : "-", AbroadProfileCount: x.AbroadProfileCount ? Extension.ToThaiNumber(x.AbroadProfileCount.toLocaleString()) : "-",
// AbroadBudgetApprove: x.AbroadBudgetApprove ? Extension.ToThaiNumber(x.AbroadBudgetApprove) : "-", AbroadBudgetApprove: x.AbroadBudgetApprove ? Extension.ToThaiNumber(x.AbroadBudgetApprove.toLocaleString()) : "-",
// ExecutiveCourseCount: x.ExecutiveCourseCount ? Extension.ToThaiNumber(x.ExecutiveCourseCount) : "-", ExecutiveCourseCount: x.ExecutiveCourseCount ? Extension.ToThaiNumber(x.ExecutiveCourseCount.toLocaleString()) : "-",
// ExecutiveProfileCount: x.ExecutiveProfileCount ? Extension.ToThaiNumber(x.ExecutiveProfileCount) : "-", ExecutiveProfileCount: x.ExecutiveProfileCount ? Extension.ToThaiNumber(x.ExecutiveProfileCount.toLocaleString()) : "-",
// ExecutiveBudgetApprove: x.ExecutiveBudgetApprove ? Extension.ToThaiNumber(x.ExecutiveBudgetApprove) : "-", ExecutiveBudgetApprove: x.ExecutiveBudgetApprove ? Extension.ToThaiNumber(x.ExecutiveBudgetApprove.toLocaleString()) : "-",
// TotalCourseCount: x.TotalCourseCount ? Extension.ToThaiNumber(x.TotalCourseCount) : "-", TotalCourseCount: x.TotalCourseCount ? Extension.ToThaiNumber(x.TotalCourseCount.toLocaleString()) : "-",
// TotalProfileCount: x.TotalProfileCount ? Extension.ToThaiNumber(x.TotalProfileCount) : "-", TotalProfileCount: x.TotalProfileCount ? Extension.ToThaiNumber(x.TotalProfileCount.toLocaleString()) : "-",
// TotalBudgetApprove: x.TotalBudgetApprove ? Extension.ToThaiNumber(x.TotalBudgetApprove) : "-", TotalBudgetApprove: x.TotalBudgetApprove ? Extension.ToThaiNumber(x.TotalBudgetApprove.toLocaleString()) : "-",
// })) }))
: [{ : [{
no: "-", no: "-",
root: "-", root: "-",
@ -856,7 +856,7 @@ export class ReportController extends Controller {
place: item.studyPlace ? item.studyPlace : "-", place: item.studyPlace ? item.studyPlace : "-",
country: item.studyCountry ? item.studyCountry : "-", country: item.studyCountry ? item.studyCountry : "-",
startAndendDate: dateDulation, 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: { data: {
year: year?Extension.ToThaiNumber((year+543).toString()):"", year: year?Extension.ToThaiNumber((year+543).toString()):"",
data: formattedData, data: formattedData,
total: Extension.ToThaiNumber(total.toString()), total: Extension.ToThaiNumber(total.toLocaleString()),
totalBudgetApprove: Extension.ToThaiNumber(totalBudgetApprove.toString()), totalBudgetApprove: Extension.ToThaiNumber(totalBudgetApprove.toLocaleString()),
}, },
}); });
} }
@ -893,9 +893,7 @@ export class ReportController extends Controller {
]; ];
// const development = await this.viewDevScholarship.find({ // const development = await this.viewDevScholarship.find({
// where:{
// degreeLevel: In(degree),
// }
// }) // })

2
src/entities/view/viewDevScholarship.ts
View file

@ -17,6 +17,8 @@ export class viewDevScholarship {
@ViewColumn() @ViewColumn()
root: string; root: string;
@ViewColumn() @ViewColumn()
degreeLevel: string;
@ViewColumn()
numberOfRecords: number; numberOfRecords: number;
@ViewColumn() @ViewColumn()
numberOfScholarshipTypes: number; numberOfScholarshipTypes: number;

12
src/migration/1739443292907-updateView.ts → src/migration/1739446719623-update_viewDevScholarship.ts
View file

@ -1,10 +1,10 @@
import { MigrationInterface, QueryRunner } from "typeorm"; import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateView1739443292907 implements MigrationInterface { export class UpdateViewDevScholarship1739446719623 implements MigrationInterface {
name = 'UpdateView1739443292907' name = 'UpdateViewDevScholarship1739446719623'
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {
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\`, MAX(\`root\`) AS root,\`degreeLevel\`,
COUNT(*) AS numberOfRecords, COUNT(*) AS numberOfRecords,
COUNT(DISTINCT \`scholarshipType\`) AS numberOfScholarshipTypes, COUNT(DISTINCT \`scholarshipType\`) AS numberOfScholarshipTypes,
@ -12,12 +12,12 @@ export class UpdateView1739443292907 implements MigrationInterface {
FROM \`developmentScholarship\` FROM \`developmentScholarship\`
GROUP BY \`rootId\`,\`degreeLevel\` 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<void> { public async down(queryRunner: QueryRunner): Promise<void> {
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(`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_profile_evaluation\``); await queryRunner.query(`DROP VIEW \`view_dev_scholarship\``);
} }
} }