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

update report + migrate

Browse source
This commit is contained in:
Bright 2025-02-13 18:07:32 +07:00
parent 29fca33c2e
commit 4dc2f476d2
2 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/controllers/ReportController.ts
View file

@ -24,7 +24,10 @@ export class ReportController extends Controller {
* @param {string} type type ประเภท report
*/
@Get("main")
async GetReportDevelopemtMain(/*@Path() type: string*/) {
async GetReportDevelopemtMain(
@Query("year") year?: number,
@Query("rootId") rootId?: string,
) {
// const _type = type.trim().toUpperCase();
const formattedData = {
@ -564,7 +567,7 @@ export class ReportController extends Controller {
*/
@Get("report3")
async report3(
@Query("year") year: number,
@Query("year") year?: number,
@Query("rootId") rootId?: string,
) {
const developments = await AppDataSource.getRepository(DevelopmentScholarship)
@ -650,7 +653,7 @@ export class ReportController extends Controller {
*/
@Get("report4")
async report4(
@Query("year") year: number,
@Query("year") year?: number,
) {
const developments = await AppDataSource.getRepository(DevelopmentScholarship)
.createQueryBuilder("developmentScholarship")
@ -797,7 +800,7 @@ export class ReportController extends Controller {
*/
@Get("report5")
async report5(
@Query("year") year: number,
@Query("year") year?: number,
// @Query("rootId") rootId: string,
) {
@ -861,7 +864,7 @@ export class ReportController extends Controller {
template: "reportFund5",
reportName: "reportFund5",
data: {
year: Extension.ToThaiNumber(year.toString()),
year: year ? Extension.ToThaiNumber(year.toString()) : "-",
data: formattedData,
total: Extension.ToThaiNumber(total.toString()),
totalBudgetApprove: Extension.ToThaiNumber(totalBudgetApprove.toString()),
@ -876,7 +879,7 @@ export class ReportController extends Controller {
*/
@Get("report6")
async report6(
@Query("year") year: number,
@Query("year") year?: number,
) {
const degree = [
"ปริญญาเอก",