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

delete comment

Browse source
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2024-12-04 22:35:00 +07:00
parent 925c5d1ab2
commit cbd57b86ab
3 changed files with 29 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

84
src/controllers/DirectorController.ts
View file

@ -47,21 +47,6 @@ export class DirectorController {
@Query("keyword") keyword?: string,
) {
await new permission().PermissionList(request, "SYS_EVA_INFO");
// const directors = await this.directorRepository.find({
// skip: (page - 1) * pageSize,
// take: pageSize,
// });
// if (keyword != undefined && keyword !== "") {
// return directors.filter(
// (x) =>
// x.prefix?.includes(keyword) ||
// x.firstName?.includes(keyword) ||
// x.lastName?.includes(keyword) ||
// x.position?.includes(keyword) ||
// x.email?.includes(keyword) ||
// x.phone?.includes(keyword),
// );
// }
const directors = await AppDataSource.getRepository(Director)
.createQueryBuilder("director")
.andWhere(
@ -74,30 +59,15 @@ export class DirectorController {
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "director.position LIKE :keyword"
: "1=1",
{
.orWhere(keyword != null && keyword != "" ? "director.position LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "director.email LIKE :keyword"
: "1=1",
{
})
.orWhere(keyword != null && keyword != "" ? "director.email LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "director.phone LIKE :keyword"
: "1=1",
{
})
.orWhere(keyword != null && keyword != "" ? "director.phone LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
},
);
});
}),
)
.orderBy("director.createdAt", "DESC")
@ -115,21 +85,6 @@ export class DirectorController {
@Query("pageSize") pageSize: number = 10,
@Query("keyword") keyword?: string,
) {
// const directors = await this.directorRepository.find({
// skip: (page - 1) * pageSize,
// take: pageSize,
// });
// if (keyword != undefined && keyword !== "") {
// return directors.filter(
// (x) =>
// x.prefix?.includes(keyword) ||
// x.firstName?.includes(keyword) ||
// x.lastName?.includes(keyword) ||
// x.position?.includes(keyword) ||
// x.email?.includes(keyword) ||
// x.phone?.includes(keyword),
// );
// }
const directors = await AppDataSource.getRepository(Director)
.createQueryBuilder("director")
.andWhere(
@ -142,30 +97,15 @@ export class DirectorController {
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "director.position LIKE :keyword"
: "1=1",
{
.orWhere(keyword != null && keyword != "" ? "director.position LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "director.email LIKE :keyword"
: "1=1",
{
})
.orWhere(keyword != null && keyword != "" ? "director.email LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "director.phone LIKE :keyword"
: "1=1",
{
})
.orWhere(keyword != null && keyword != "" ? "director.phone LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
},
);
});
}),
)
.orderBy("director.createdAt", "DESC")

21
src/controllers/EvaluationController.ts
View file

@ -78,15 +78,15 @@ export class EvaluationController {
},
) {
// await new permission().PermissionList(request, "SYS_EVA_REQ");
let _data = await new permission().PermissionOrgList(request,"SYS_EVA_REQ");
let _data = await new permission().PermissionOrgList(request, "SYS_EVA_REQ");
const [evaluation, total] = await AppDataSource.getRepository(Evaluation)
.createQueryBuilder("evaluation")
.andWhere(
_data.root != undefined && _data.root != null
? _data.root[0] != null
? `evaluation.rootId IN (:...root)`
: `evaluation.rootId is null`
: "1=1",
_data.root != undefined && _data.root != null
? _data.root[0] != null
? `evaluation.rootId IN (:...root)`
: `evaluation.rootId is null`
: "1=1",
{
root: _data.root,
},
@ -120,7 +120,7 @@ export class EvaluationController {
{
child3: _data.child3,
},
)
)
.andWhere(
_data.child4 != undefined && _data.child4 != null
? _data.child4[0] != null
@ -198,13 +198,6 @@ export class EvaluationController {
).andWhere("evaluation.createdUserId = :createdUserId", {
createdUserId: request.user.sub,
});
// .andWhere(
// new Brackets((qb) => {
// qb.orWhere("evaluation.positionLevel LIKE :keyword", {
// keyword: `%${body.keyword}%`,
// });
// }),
// );
}),
)
.orderBy("evaluation.lastUpdatedAt", "DESC")

57
src/controllers/MeetingController.ts
View file

@ -48,33 +48,15 @@ export class MeetingController {
@Query("keyword") keyword?: string,
) {
await new permission().PermissionList(request, "SYS_EVA_INFO");
// const meetings = await this.meetingRepository.find({
// skip: (page - 1) * pageSize,
// take: pageSize,
// });
// if (keyword != undefined && keyword !== "") {
// return meetings.filter((x) => x.title?.includes(keyword) || x.round?.includes(keyword));
// }
const meetings = await AppDataSource.getRepository(Meeting)
.createQueryBuilder("meeting")
.andWhere(
new Brackets((qb) => {
qb.where(
keyword != null && keyword != ""
? "meeting.title LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "meeting.round LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
);
qb.where(keyword != null && keyword != "" ? "meeting.title LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
}).orWhere(keyword != null && keyword != "" ? "meeting.round LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
});
}),
)
.orderBy("meeting.createdAt", "DESC")
@ -91,34 +73,15 @@ export class MeetingController {
@Query("pageSize") pageSize: number = 10,
@Query("keyword") keyword?: string,
) {
// const meetings = await this.meetingRepository.find({
// skip: (page - 1) * pageSize,
// take: pageSize,
// });
// if (keyword != undefined && keyword !== "") {
// return meetings.filter((x) => x.title?.includes(keyword) || x.round?.includes(keyword));
// }
const meetings = await AppDataSource.getRepository(Meeting)
.createQueryBuilder("meeting")
.andWhere(
new Brackets((qb) => {
qb.where(
keyword != null && keyword != ""
? "meeting.title LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "meeting.round LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
);
qb.where(keyword != null && keyword != "" ? "meeting.title LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
}).orWhere(keyword != null && keyword != "" ? "meeting.round LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
});
}),
)
.orderBy("meeting.createdAt", "DESC")