Merge branch 'develop'

This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2024-12-24 17:50:08 +07:00
commit a60f8569dc

View file

@ -1056,6 +1056,7 @@ export class ReportController extends Controller {
commandYear: number
templateDoc: string | null
amount: Double | null
amountSpecial?: Double | null;
positionSalaryAmount: Double | null
mouthSalaryAmount: Double | null
}[]
@ -1142,6 +1143,7 @@ export class ReportController extends Controller {
commandYear: number
templateDoc: string | null
amount: Double | null
amountSpecial?: Double | null;
positionSalaryAmount: Double | null
mouthSalaryAmount: Double | null
}[]
@ -1304,4 +1306,49 @@ export class ReportController extends Controller {
)
return new HttpSuccess(directors)
}
@Get("repot1")
public async repot1(@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("repot2")
public async repot2(@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("repot3")
public async repot3(@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: "",
});
}
}