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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 48s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-10-14 11:20:50 +07:00
commit 77c159b6c7
4 changed files with 142 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
.github/workflows/discord-notify.yml vendored Normal file
View file

@ -0,0 +1,22 @@
name: Discord PR Notify
on:
pull_request:
types: [opened]
jobs:
discord:
runs-on: ubuntu-latest
steps:
- name: Send Discord
run: |
curl -X POST "${{ secrets.DISCORD_WEBHOOK_PULLREQUEST }}" \
-H "Content-Type: application/json" \
-d '{
"embeds": [{
"title": "🔔 **Service:** ${{ github.repository }}",
"description": "👤 **Author:** ${{ github.event.pull_request.user.login }}\n🌿 **Branch:** ${{ github.event.pull_request.head.ref }} → ${{ github.event.pull_request.base.ref }}\n📦 **Pull Request:** [#${{ github.event.pull_request.number }} - ${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})",
"color": 5814783,
"timestamp": "${{ github.event.pull_request.created_at }}"
}]
}'

28
src/controllers/KpiPeriodController.ts
View file

@ -235,20 +235,32 @@ export class kpiPeriodController extends Controller {
@Query("pageSize") pageSize: number = 10,
@Query("year") year?: number,
@Query("keyword") keyword?: string,
@Query("sortBy") sortBy?: string,
@Query("descending") descending?: boolean,
) {
await new permission().PermissionList(request, "SYS_KPI_ROUND");
const [kpiPeriod, total] = await AppDataSource.getRepository(KpiPeriod)
let query = await AppDataSource.getRepository(KpiPeriod)
.createQueryBuilder("kpiPeriod")
.andWhere(
year !== 0 && year != null && year != undefined ? "kpiPeriod.year = :year" : "1=1",
{ year: year },
)
.orderBy("kpiPeriod.year", "DESC")
.addOrderBy("kpiPeriod.durationKPI", "DESC")
.addOrderBy("kpiPeriod.startDate", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();
if (sortBy) {
query = query.orderBy(
`kpiPeriod.${sortBy}`,
descending ? "DESC" : "ASC"
);
}else{
query = query.orderBy("kpiPeriod.year", "DESC")
.addOrderBy("kpiPeriod.durationKPI", "DESC")
.addOrderBy("kpiPeriod.startDate", "DESC")
}
const [kpiPeriod, total] = await query
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();
return new HttpSuccess({ data: kpiPeriod, total });
}
@ -291,7 +303,7 @@ export class kpiPeriodController extends Controller {
@Query("year") year?: number,
@Query("keyword") keyword?: string,
) {
const [kpiPeriod, total] = await AppDataSource.getRepository(KpiPeriod)
const [kpiPeriod,total] = await AppDataSource.getRepository(KpiPeriod)
.createQueryBuilder("kpiPeriod")
.andWhere(
year !== 0 && year != null && year != undefined ? "kpiPeriod.year = :year" : "1=1",

45
src/controllers/KpiUserDevelopmentController.ts
View file

@ -360,6 +360,8 @@ export class KpiUserDevelopmentController extends Controller {
// results?: string | null;
// reqedit?: string | null;
// evaluating?: boolean | null;
sortBy?: string;
descending?: boolean;
},
) {
// await new permission().PermissionList(request, "SYS_RESULT");
@ -372,7 +374,7 @@ export class KpiUserDevelopmentController extends Controller {
_data = x;
})
.catch((x) => {});
const [kpiUserDevelopment, total] = await AppDataSource.getRepository(KpiUserDevelopment)
let query = await AppDataSource.getRepository(KpiUserDevelopment)
.createQueryBuilder("kpiUserDevelopment")
.leftJoinAndSelect("kpiUserDevelopment.kpiUserEvaluation", "kpiUserEvaluation")
.leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
@ -476,7 +478,46 @@ export class KpiUserDevelopmentController extends Controller {
});
}),
)
.orderBy("kpiUserDevelopment.createdAt", "ASC")
if (requestBody.sortBy) {
if(requestBody.sortBy === "developmentName"){
query = query.orderBy(
`kpiUserDevelopment.name`,
requestBody.descending ? "DESC" : "ASC"
);
}else if (requestBody.sortBy === "organization"){
query = query
.orderBy(`kpiUserEvaluation.child4`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child3`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child2`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child1`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.org`, requestBody.descending ? "DESC" : "ASC");
}else if(requestBody.sortBy === "firstname"){
query = query.orderBy(
`kpiUserEvaluation.firstName`,
requestBody.descending ? "DESC" : "ASC"
);
}else if(requestBody.sortBy === "lastname"){
query = query.orderBy(
`kpiUserEvaluation.lastName`,
requestBody.descending ? "DESC" : "ASC"
);
}else if(requestBody.sortBy === "root"){
query = query.orderBy(
`kpiUserEvaluation.org`,
requestBody.descending ? "DESC" : "ASC"
);
}else{
query = query.orderBy(
`kpiUserEvaluation.${requestBody.sortBy}`,
requestBody.descending ? "DESC" : "ASC"
);
}
}else{
query = query.orderBy("kpiUserDevelopment.createdAt", "ASC")
}
const [kpiUserDevelopment, total] = await query
.skip((requestBody.page - 1) * requestBody.pageSize)
.take(requestBody.pageSize)
.getManyAndCount();

62
src/controllers/KpiUserEvaluationController.ts
View file

@ -241,6 +241,8 @@ export class KpiUserEvaluationController extends Controller {
results?: string | null;
reqedit?: string | null;
evaluating?: boolean | null;
sortBy?: string;
descending?: boolean;
},
) {
// await new permission().PermissionList(request, "SYS_RESULT");
@ -253,7 +255,7 @@ export class KpiUserEvaluationController extends Controller {
_data = x;
})
.catch((x) => {});
const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
let query = await AppDataSource.getRepository(KpiUserEvaluation)
.createQueryBuilder("kpiUserEvaluation")
.andWhere(
_data.root != undefined && _data.root != null
@ -385,7 +387,31 @@ export class KpiUserEvaluationController extends Controller {
});
}),
)
.orderBy("kpiUserEvaluation.createdAt", "DESC")
if (requestBody.sortBy) {
if(requestBody.sortBy === "root"){
query = query.orderBy(
`kpiUserEvaluation.org`,
requestBody.descending ? "DESC" : "ASC"
);
}else if(requestBody.sortBy === "organization"){
query = query
.orderBy(`kpiUserEvaluation.child4`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child3`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child2`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child1`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.org`, requestBody.descending ? "DESC" : "ASC");
}else{
query = query.orderBy(
`kpiUserEvaluation.${requestBody.sortBy}`,
requestBody.descending ? "DESC" : "ASC"
);
}
}else{
query = query.orderBy("kpiUserEvaluation.createdAt", "DESC")
}
const [kpiUserEvaluation, total] = await query
.skip((requestBody.page - 1) * requestBody.pageSize)
.take(requestBody.pageSize)
.getManyAndCount();
@ -441,6 +467,8 @@ export class KpiUserEvaluationController extends Controller {
keyword?: string;
status?: string | null;
results?: string | null;
sortBy?: string;
descending?: boolean;
},
) {
let _data = await new permission().PermissionOrgList(request, "SYS_KPI_LIST");
@ -452,7 +480,7 @@ export class KpiUserEvaluationController extends Controller {
.catch((x) => {});
let conditionFullName =
"CONCAT(kpiUserEvaluation.prefix, kpiUserEvaluation.firstName, ' ', kpiUserEvaluation.lastName) LIKE :keyword";
const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
let query = await AppDataSource.getRepository(KpiUserEvaluation)
.createQueryBuilder("kpiUserEvaluation")
.leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
.andWhere(
@ -564,8 +592,32 @@ export class KpiUserEvaluationController extends Controller {
child4: _data.child4,
},
)
.orderBy("kpiPeriod.year", "DESC")
.addOrderBy("kpiUserEvaluation.createdAt", "DESC")
if (requestBody.sortBy) {
if(requestBody.sortBy === "root"){
query = query.orderBy(
`kpiUserEvaluation.org`,
requestBody.descending ? "DESC" : "ASC"
);
}else if(requestBody.sortBy === "organization"){
query = query
.orderBy(`kpiUserEvaluation.child4`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child3`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child2`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.child1`, requestBody.descending ? "DESC" : "ASC")
.addOrderBy(`kpiUserEvaluation.org`, requestBody.descending ? "DESC" : "ASC");
}else{
query = query.orderBy(
`kpiUserEvaluation.${requestBody.sortBy}`,
requestBody.descending ? "DESC" : "ASC"
);
}
}else{
query = query.orderBy("kpiPeriod.year", "DESC")
.addOrderBy("kpiUserEvaluation.createdAt", "DESC")
}
const [kpiUserEvaluation, total] = await query
.skip((requestBody.page - 1) * requestBody.pageSize)
.take(requestBody.pageSize)
.getManyAndCount();