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

fix: range date of retire

Browse source
This commit is contained in:
Warunee Tamkoo 2025-10-17 12:14:35 +07:00
parent a25b017bad
commit 6554636eeb
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileController.ts
View file

@ -10438,8 +10438,8 @@ 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", { .andWhere("profile.isLeave = :isLeave AND profile.isRetirement = :isRetirement", {
isLeave: false, isLeave: false,

4
src/controllers/ProfileEmployeeController.ts
View file

@ -5034,8 +5034,8 @@ export class ProfileEmployeeController extends Controller {
.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("profileEmployee.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( .andWhere(
"profileEmployee.isLeave = :isLeave AND profileEmployee.isRetirement = :isRetirement", "profileEmployee.isLeave = :isLeave AND profileEmployee.isRetirement = :isRetirement",

4
src/controllers/ProfileEmployeeTempController.ts
View file

@ -3231,8 +3231,8 @@ export class ProfileEmployeeTempController 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("profileEmployee.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( .andWhere(
"profileEmployee.isLeave = :isLeave AND profileEmployee.isRetirement = :isRetirement", "profileEmployee.isLeave = :isLeave AND profileEmployee.isRetirement = :isRetirement",