This commit is contained in:
AdisakKanthawilang 2025-02-11 19:45:59 +07:00
parent 4151fb0659
commit f703d8e9b2

View file

@ -1111,6 +1111,7 @@ export class ReportController extends Controller {
isActive: true,
},
});
// console.log(">>>>1",salaryPeriodIncrease1_APR);
let salaryOrg1_APR = null;
if (salaryPeriodIncrease1_APR) {
@ -1124,6 +1125,7 @@ export class ReportController extends Controller {
},
});
}
// console.log(">>>>2",salaryOrg1_APR);
let salaryOrg1_OCT = null;
if (salaryPeriodIncrease1_OCT) {
@ -1144,6 +1146,8 @@ export class ReportController extends Controller {
type: Not(In(["NONE", "PENDING"])),
},
});
// console.log(">>>>3",salaryProfile1);
//รอบปีก่อนหน้า
const salaryPeriodIncrease2_APR = await this.salaryPeriodRepository.findOne({
where: {
@ -1159,7 +1163,7 @@ export class ReportController extends Controller {
isActive: true,
},
});
// console.log(">>>>3",salaryPeriodIncrease2_APR);
let salaryOrg2_APR = null;
if (salaryPeriodIncrease2_APR) {
salaryOrg2_APR = await this.salaryOrgRepository.findOne({
@ -2485,6 +2489,31 @@ export class ReportController extends Controller {
});
}
/**
* API (.)
*
* @summary (.)
*
* @param {string} rootId Guid, *Id Root
* @param {string} salaryPeriodId Guid, *Id Period
*/
@Get("gov-10/{rootId}/{salaryPeriodId}/{group}")
async SalaryReport10(
@Path() rootId: string,
@Path() salaryPeriodId: string,
@Path() group: string,
) {
return new HttpSuccess({
template: "gov2-10",
reportName: "gov2-10",
data: {
},
});
}
/**
* API 01-
*