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

หาคนเกษียณตามปี

Browse source
This commit is contained in:
mamoss 2025-10-16 23:04:50 +07:00
parent 58274b479c
commit f2efb44336
3 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ProfileController.ts
View file

@ -4975,7 +4975,7 @@ export class ProfileController extends Controller {
*
*/
@Post("cal/retire")
async calDateRetire(@Body() body:{birthDate: Date}) {
async calDateRetire(@Body() body: { birthDate: Date }) {
const retireDate = await calculateRetireDate(body.birthDate);
const age = calculateAge(body.birthDate);
@ -10436,7 +10436,11 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions")
.leftJoinAndSelect("positions.posExecutive", "posExecutive")
.where("YEAR(profile.dateRetire) = :year", { year })
// calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive)
.where("profile.dateRetire BETWEEN :start AND :end", {
start: `${year - 1}-10-02`,
end: `${year}-10-01`,
})
.getMany();
if (!profiles || profiles.length === 0) {

6
src/controllers/ProfileEmployeeController.ts
View file

@ -5032,7 +5032,11 @@ export class ProfileEmployeeController extends Controller {
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions")
.where("YEAR(profileEmployee.dateRetire) = :year", { year })
// calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive)
.where("profile.dateRetire BETWEEN :start AND :end", {
start: `${year - 1}-10-02`,
end: `${year}-10-01`,
})
.getMany();
if (!profiles || profiles.length === 0) {

44
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1527,7 +1527,7 @@ export class ProfileEmployeeTempController extends Controller {
if (!findRevision) {
throw new HttpError(HttpStatus.NOT_FOUND, "not found. OrgRevision");
}
let query = await this.profileRepo
.createQueryBuilder("profileEmployee")
.leftJoinAndSelect("profileEmployee.posLevel", "posLevel")
@ -1640,36 +1640,24 @@ export class ProfileEmployeeTempController extends Controller {
}
}
}),
)
);
if (sortBy) {
if(sortBy == "posLevel"){
query = query.orderBy(
`posLevel.posLevelName`,
descending ? "DESC" : "ASC"
);
}else if(sortBy == "posType"){
query = query.orderBy(
`posType.posTypeName`,
descending ? "DESC" : "ASC"
);
}else if(sortBy == "govAge"){
query = query.orderBy(
`profileEmployee.dateAppoint`,
descending ? "DESC" : "ASC"
);
}else{
query = query.orderBy(
`profileEmployee.${sortBy}`,
descending ? "DESC" : "ASC"
);
if (sortBy == "posLevel") {
query = query.orderBy(`posLevel.posLevelName`, descending ? "DESC" : "ASC");
} else if (sortBy == "posType") {
query = query.orderBy(`posType.posTypeName`, descending ? "DESC" : "ASC");
} else if (sortBy == "govAge") {
query = query.orderBy(`profileEmployee.dateAppoint`, descending ? "DESC" : "ASC");
} else {
query = query.orderBy(`profileEmployee.${sortBy}`, descending ? "DESC" : "ASC");
}
}
const [record, total] = await query
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();
const data = await Promise.all(
record.map((_data) => {
@ -3241,7 +3229,11 @@ export class ProfileEmployeeTempController extends Controller {
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions")
// .leftJoinAndSelect("positions.posExecutive", "posExecutive")
.where("YEAR(profileEmployee.dateRetire) = :year", { year })
// calculate range: start = 2 Oct of (year-1), end = 1 Oct of year (inclusive)
.where("profile.dateRetire BETWEEN :start AND :end", {
start: `${year - 1}-10-02`,
end: `${year}-10-01`,
})
.getMany();
if (!profiles || profiles.length === 0) {