hrms-bangkok/hrms-api-salary
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-04-10 11:44:38 +07:00
parent 3b32e38e53
commit c2b7df9146
1 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/controllers/ReportController.ts
View file

@ -5915,33 +5915,36 @@ export class ReportController extends Controller {
});
//ปีก่อนหน้า
salaryProfilePerviousAPR = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
salaryOrg: {
snapshot: "SNAP2",
salaryPeriodId: perviousYearAPR.id,
if(perviousYearAPR){
salaryProfilePerviousAPR = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
salaryOrg: {
snapshot: "SNAP2",
salaryPeriodId: perviousYearAPR.id,
},
},
},
order: {
orgShortName: "ASC",
posMasterNo: "ASC",
},
});
salaryProfilePerviousOCT = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
salaryOrg: {
snapshot: "SNAP2",
salaryPeriodId: perviousYearOCT.id,
order: {
orgShortName: "ASC",
posMasterNo: "ASC",
},
},
order: {
orgShortName: "ASC",
posMasterNo: "ASC",
},
});
});
}
if(perviousYearOCT){
salaryProfilePerviousOCT = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
salaryOrg: {
snapshot: "SNAP2",
salaryPeriodId: perviousYearOCT.id,
},
},
order: {
orgShortName: "ASC",
posMasterNo: "ASC",
},
});
}
//ปีปัจุบัน
const salaryProfileCurrentAPR = await this.salaryProfileEmployeeRepository.find({