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:
Adisak 2025-10-17 13:52:06 +07:00
commit 897dda67ad
3 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ProfileController.ts
View file

@ -10438,8 +10438,12 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("positions.posExecutive", "posExecutive") .leftJoinAndSelect("positions.posExecutive", "posExecutive")
// calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive) // calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive)
.where("profile.dateRetire BETWEEN :start AND :end", { .where("profile.dateRetire BETWEEN :start AND :end", {
start: `${year - 1}-10-02`, start: `${year - 1}-10-01`,
end: `${year}-10-01`, end: `${year}-09-30`,
})
.andWhere("profile.isLeave = :isLeave AND profile.isRetirement = :isRetirement", {
isLeave: false,
isRetirement: false,
}) })
.getMany(); .getMany();

13
src/controllers/ProfileEmployeeController.ts
View file

@ -5033,10 +5033,17 @@ export class ProfileEmployeeController extends Controller {
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions") .leftJoinAndSelect("current_holders.positions", "positions")
// calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive) // calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive)
.where("profile.dateRetire BETWEEN :start AND :end", { .where("profileEmployee.dateRetire BETWEEN :start AND :end", {
start: `${year - 1}-10-02`, start: `${year - 1}-10-01`,
end: `${year}-10-01`, end: `${year}-09-30`,
}) })
.andWhere(
"profileEmployee.isLeave = :isLeave AND profileEmployee.isRetirement = :isRetirement",
{
isLeave: false,
isRetirement: false,
},
)
.getMany(); .getMany();
if (!profiles || profiles.length === 0) { if (!profiles || profiles.length === 0) {

13
src/controllers/ProfileEmployeeTempController.ts
View file

@ -3230,10 +3230,17 @@ export class ProfileEmployeeTempController extends Controller {
.leftJoinAndSelect("current_holders.positions", "positions") .leftJoinAndSelect("current_holders.positions", "positions")
// .leftJoinAndSelect("positions.posExecutive", "posExecutive") // .leftJoinAndSelect("positions.posExecutive", "posExecutive")
// calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive) // calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive)
.where("profile.dateRetire BETWEEN :start AND :end", { .where("profileEmployee.dateRetire BETWEEN :start AND :end", {
start: `${year - 1}-10-02`, start: `${year - 1}-10-01`,
end: `${year}-10-01`, end: `${year}-09-30`,
}) })
.andWhere(
"profileEmployee.isLeave = :isLeave AND profileEmployee.isRetirement = :isRetirement",
{
isLeave: false,
isRetirement: false,
},
)
.getMany(); .getMany();
if (!profiles || profiles.length === 0) { if (!profiles || profiles.length === 0) {