บันทึกประวัติเงินเดือน
This commit is contained in:
parent
d490a7cea1
commit
4cf4ec0f78
1 changed files with 33 additions and 38 deletions
|
|
@ -1056,9 +1056,12 @@ export class ReportController extends Controller {
|
||||||
commandYear: number
|
commandYear: number
|
||||||
templateDoc: string | null
|
templateDoc: string | null
|
||||||
amount: Double | null
|
amount: Double | null
|
||||||
amountSpecial?: Double | null;
|
amountSpecial?: Double | null
|
||||||
positionSalaryAmount: Double | null
|
positionSalaryAmount: Double | null
|
||||||
mouthSalaryAmount: 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,
|
amount: v.amount,
|
||||||
positionSalaryAmount: v.positionSalaryAmount,
|
positionSalaryAmount: v.positionSalaryAmount,
|
||||||
mouthSalaryAmount: v.mouthSalaryAmount,
|
mouthSalaryAmount: v.mouthSalaryAmount,
|
||||||
|
refCommandCode: v.refCommandCode,
|
||||||
|
refCommandName: v.refCommandName,
|
||||||
})),
|
})),
|
||||||
})
|
})
|
||||||
.then(async res => {
|
.then(async res => {
|
||||||
|
|
@ -1143,9 +1148,12 @@ export class ReportController extends Controller {
|
||||||
commandYear: number
|
commandYear: number
|
||||||
templateDoc: string | null
|
templateDoc: string | null
|
||||||
amount: Double | null
|
amount: Double | null
|
||||||
amountSpecial?: Double | null;
|
amountSpecial?: Double | null
|
||||||
positionSalaryAmount: Double | null
|
positionSalaryAmount: Double | null
|
||||||
mouthSalaryAmount: 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,
|
positionSalaryAmount: v.positionSalaryAmount,
|
||||||
mouthSalaryAmount: v.mouthSalaryAmount,
|
mouthSalaryAmount: v.mouthSalaryAmount,
|
||||||
isGovernment: false,
|
isGovernment: false,
|
||||||
|
refCommandCode: v.refCommandCode,
|
||||||
|
refCommandName: v.refCommandName,
|
||||||
})),
|
})),
|
||||||
})
|
})
|
||||||
.then(async res => {
|
.then(async res => {
|
||||||
|
|
@ -1232,6 +1242,9 @@ export class ReportController extends Controller {
|
||||||
amountSpecial?: Double | null
|
amountSpecial?: Double | null
|
||||||
positionSalaryAmount: Double | null
|
positionSalaryAmount: Double | null
|
||||||
mouthSalaryAmount: 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")
|
@Get("report1")
|
||||||
public async report1(@Request() req: RequestWithUser,
|
public async report1(@Request() req: RequestWithUser, @Query("nodeId") nodeId?: string, @Query("node") node?: string, @Query("startDate") startDate?: Date, @Query("endDate") endDate?: Date) {
|
||||||
@Query("nodeId") nodeId?: string,
|
return new HttpSuccess({
|
||||||
@Query("node") node?: string,
|
template: "placementProbation01",
|
||||||
@Query("startDate") startDate?: Date,
|
reportName: "xlsx-report",
|
||||||
@Query("endDate") endDate?: Date,
|
data: "",
|
||||||
) {
|
})
|
||||||
|
|
||||||
return new HttpSuccess({
|
|
||||||
template: "placementProbation01",
|
|
||||||
reportName: "xlsx-report",
|
|
||||||
data: "",
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("report2")
|
@Get("report2")
|
||||||
public async report2(@Request() req: RequestWithUser,
|
public async report2(@Request() req: RequestWithUser, @Query("nodeId") nodeId?: string, @Query("node") node?: string, @Query("startDate") startDate?: Date, @Query("endDate") endDate?: Date) {
|
||||||
@Query("nodeId") nodeId?: string,
|
return new HttpSuccess({
|
||||||
@Query("node") node?: string,
|
template: "placementProbation02",
|
||||||
@Query("startDate") startDate?: Date,
|
reportName: "xlsx-report",
|
||||||
@Query("endDate") endDate?: Date,
|
data: "",
|
||||||
) {
|
})
|
||||||
|
|
||||||
return new HttpSuccess({
|
|
||||||
template: "placementProbation02",
|
|
||||||
reportName: "xlsx-report",
|
|
||||||
data: "",
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("report3")
|
@Get("report3")
|
||||||
public async report3(@Request() req: RequestWithUser,
|
public async report3(@Request() req: RequestWithUser, @Query("nodeId") nodeId?: string, @Query("node") node?: string, @Query("startDate") startDate?: Date, @Query("endDate") endDate?: Date) {
|
||||||
@Query("nodeId") nodeId?: string,
|
return new HttpSuccess({
|
||||||
@Query("node") node?: string,
|
template: "placementProbation03",
|
||||||
@Query("startDate") startDate?: Date,
|
reportName: "xlsx-report",
|
||||||
@Query("endDate") endDate?: Date,
|
data: "",
|
||||||
) {
|
})
|
||||||
|
|
||||||
return new HttpSuccess({
|
|
||||||
template: "placementProbation03",
|
|
||||||
reportName: "xlsx-report",
|
|
||||||
data: "",
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue