diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 966c571..7eac2d6 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -10,12 +10,13 @@ import { PosLevel } from "../entities/PosLevel"; import Extension from "../interfaces/extension"; import { DevelopmentScholarship } from "../entities/DevelopmentScholarship"; import { IsNull, Not } from "typeorm"; +import { viewDevScholarship } from "../entities/view/viewDevScholarship"; @Route("api/v1/development/report") @Tags("Report") @Security("bearerAuth") export class ReportController extends Controller { private developmentScholarshipRepository = AppDataSource.getRepository(DevelopmentScholarship); - + private viewDevScholarship = AppDataSource.getRepository(viewDevScholarship); /** * API Report รายการโครงการ/หลักสูตรการฝึกอบรมที่หน่วยงานของกรุงเทพมหานครเป็นผู้จัด * @@ -861,7 +862,7 @@ export class ReportController extends Controller { template: "reportFund5", reportName: "reportFund5", data: { - year: Extension.ToThaiNumber(year.toString()), + year: Extension.ToThaiNumber((year+543).toString()), data: formattedData, total: Extension.ToThaiNumber(total.toString()), totalBudgetApprove: Extension.ToThaiNumber(totalBudgetApprove.toString()), @@ -888,6 +889,12 @@ export class ReportController extends Controller { "ม.3", ]; + // const development = await this.viewDevScholarship.find({ + // where:{ + // degreeLevel: In(degree), + // } + // }) + // const totalBudgetApprove = development.reduce((sum, item) => sum + Number(item.budgetApprove), 0); // const formattedData = development.map((item, index) => { @@ -931,6 +938,7 @@ export class ReportController extends Controller { template: "reportFund6", reportName: "reportFund6", data: { + year: Extension.ToThaiNumber((year+543).toString()), data: "", }, });