Merge branch 'develop'
This commit is contained in:
commit
a60f8569dc
1 changed files with 47 additions and 0 deletions
|
|
@ -1056,6 +1056,7 @@ export class ReportController extends Controller {
|
||||||
commandYear: number
|
commandYear: number
|
||||||
templateDoc: string | null
|
templateDoc: string | null
|
||||||
amount: Double | null
|
amount: Double | null
|
||||||
|
amountSpecial?: Double | null;
|
||||||
positionSalaryAmount: Double | null
|
positionSalaryAmount: Double | null
|
||||||
mouthSalaryAmount: Double | null
|
mouthSalaryAmount: Double | null
|
||||||
}[]
|
}[]
|
||||||
|
|
@ -1142,6 +1143,7 @@ export class ReportController extends Controller {
|
||||||
commandYear: number
|
commandYear: number
|
||||||
templateDoc: string | null
|
templateDoc: string | null
|
||||||
amount: Double | null
|
amount: Double | null
|
||||||
|
amountSpecial?: Double | null;
|
||||||
positionSalaryAmount: Double | null
|
positionSalaryAmount: Double | null
|
||||||
mouthSalaryAmount: Double | null
|
mouthSalaryAmount: Double | null
|
||||||
}[]
|
}[]
|
||||||
|
|
@ -1304,4 +1306,49 @@ export class ReportController extends Controller {
|
||||||
)
|
)
|
||||||
return new HttpSuccess(directors)
|
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: "",
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue