diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 8a8dd2b..14d9877 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -1056,9 +1056,12 @@ export class ReportController extends Controller { commandYear: number templateDoc: string | null amount: Double | null - amountSpecial?: Double | null; + amountSpecial?: Double | null positionSalaryAmount: Double | null mouthSalaryAmount: Double | null + mpCee?: string | null + refCommandCode?: string | null + refCommandName?: string | null }[] } ) { @@ -1073,6 +1076,8 @@ export class ReportController extends Controller { amount: v.amount, positionSalaryAmount: v.positionSalaryAmount, mouthSalaryAmount: v.mouthSalaryAmount, + refCommandCode: v.refCommandCode, + refCommandName: v.refCommandName, })), }) .then(async res => { @@ -1143,9 +1148,12 @@ export class ReportController extends Controller { commandYear: number templateDoc: string | null amount: Double | null - amountSpecial?: Double | null; + amountSpecial?: Double | null positionSalaryAmount: Double | null mouthSalaryAmount: Double | null + mpCee?: string | null + refCommandCode?: string | null + refCommandName?: string | null }[] } ) { @@ -1161,6 +1169,8 @@ export class ReportController extends Controller { positionSalaryAmount: v.positionSalaryAmount, mouthSalaryAmount: v.mouthSalaryAmount, isGovernment: false, + refCommandCode: v.refCommandCode, + refCommandName: v.refCommandName, })), }) .then(async res => { @@ -1232,6 +1242,9 @@ export class ReportController extends Controller { amountSpecial?: Double | null positionSalaryAmount: Double | null mouthSalaryAmount: Double | null + mpCee?: string | null + refCommandCode?: string | null + refCommandName?: string | null }[] } ) { @@ -1308,47 +1321,29 @@ export class ReportController extends Controller { } @Get("report1") - public async report1(@Request() req: RequestWithUser, - @Query("nodeId") nodeId?: string, - @Query("node") node?: string, - @Query("startDate") startDate?: Date, - @Query("endDate") endDate?: Date, - ) { - - return new HttpSuccess({ - template: "placementProbation01", - reportName: "xlsx-report", - data: "", - }); + public async report1(@Request() req: RequestWithUser, @Query("nodeId") nodeId?: string, @Query("node") node?: string, @Query("startDate") startDate?: Date, @Query("endDate") endDate?: Date) { + return new HttpSuccess({ + template: "placementProbation01", + reportName: "xlsx-report", + data: "", + }) } @Get("report2") - public async report2(@Request() req: RequestWithUser, - @Query("nodeId") nodeId?: string, - @Query("node") node?: string, - @Query("startDate") startDate?: Date, - @Query("endDate") endDate?: Date, - ) { - - return new HttpSuccess({ - template: "placementProbation02", - reportName: "xlsx-report", - data: "", - }); + public async report2(@Request() req: RequestWithUser, @Query("nodeId") nodeId?: string, @Query("node") node?: string, @Query("startDate") startDate?: Date, @Query("endDate") endDate?: Date) { + return new HttpSuccess({ + template: "placementProbation02", + reportName: "xlsx-report", + data: "", + }) } @Get("report3") - public async report3(@Request() req: RequestWithUser, - @Query("nodeId") nodeId?: string, - @Query("node") node?: string, - @Query("startDate") startDate?: Date, - @Query("endDate") endDate?: Date, - ) { - - return new HttpSuccess({ - template: "placementProbation03", - reportName: "xlsx-report", - data: "", - }); + public async report3(@Request() req: RequestWithUser, @Query("nodeId") nodeId?: string, @Query("node") node?: string, @Query("startDate") startDate?: Date, @Query("endDate") endDate?: Date) { + return new HttpSuccess({ + template: "placementProbation03", + reportName: "xlsx-report", + data: "", + }) } }