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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2025-03-04 18:07:23 +07:00
commit 4647120172
6 changed files with 359 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/ReportController.ts
View file

@ -259,7 +259,7 @@ export class ReportController extends Controller {
if (tenureType != "" && tenureType == "position") {
tenureTypeCondition = "registryOfficer.Years BETWEEN :tenureMin AND :tenureMax";
} else if (tenureType != "" && tenureType == "level") {
tenureTypeCondition = "registryOfficer.Years BETWEEN :tenureMin AND :tenureMax"; //xxxxxxxxxxxx
tenureTypeCondition = "registryOfficer.levelYears BETWEEN :tenureMin AND :tenureMax"; //xxxxxxxxxxxx
}
const [lists, total] = await AppDataSource.getRepository(viewRegistryOfficer)
@ -385,12 +385,9 @@ export class ReportController extends Controller {
Days: x.posExecutiveDays,
},
posLevelDate: {
// Years: x.levelYears,
// Months: x.levelMonths,
// Days: x.levelDays,
Years: 0,
Months: 0,
Days: 0,
Years: x.levelYears,
Months: x.levelMonths,
Days: x.levelDays,
},
}));
return new HttpSuccess({