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

Merge branch 'develop' of https://github.com/Frappet/bma-ehr-kpi into develop

Browse source
This commit is contained in:
AnandaTon 2024-05-08 14:28:02 +07:00
commit 94fddd1743
5 changed files with 85 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/controllers/KpiPlanController.ts
View file

@ -340,8 +340,10 @@ export class kpiPlanController extends Controller {
}
const formattedData = {
id: kpiPlan.id,
year: kpiPlan.kpiPeriod == null ? null : kpiPlan.kpiPeriod.year,
round: kpiPlan.kpiPeriod == null ? null : kpiPlan.kpiPeriod.durationKPI,
// year: kpiPlan.kpiPeriod == null ? null : kpiPlan.kpiPeriod.year,
// round: kpiPlan.kpiPeriod == null ? null : kpiPlan.kpiPeriod.durationKPI,
year: kpiPlan.year == null ? null : kpiPlan.year,
round: kpiPlan.period == null ? null : kpiPlan.period,
kpiPeriodId: kpiPlan.kpiPeriodId,
including: kpiPlan.including,
includingName: kpiPlan.includingName,
@ -372,6 +374,7 @@ export class kpiPlanController extends Controller {
strategyChild3: kpiPlan.strategyChild3Id,
strategyChild4: kpiPlan.strategyChild4Id,
strategyChild5: kpiPlan.strategyChild5Id,
documentInfoEvidence: kpiPlan.documentInfoEvidence,
};
return new HttpSuccess(formattedData);
}
@ -392,9 +395,9 @@ export class kpiPlanController extends Controller {
period?: string | null;
nodeId?: string | null;
node?: number | null;
keyword?: string;
isAll?: boolean;
isNull?: boolean;
keyword?: string | null;
isAll?: boolean | false;
// isNull?: boolean | false;
},
) {
let condition = "";
@ -442,21 +445,37 @@ export class kpiPlanController extends Controller {
}
parameters.nodeId = `%${requestBody.nodeId}%`;
}
if (requestBody.year && requestBody.period && requestBody.isNull === true) {
condition += ` AND (kpiPlan.year LIKE :year OR kpiPlan.year IS NULL) AND (kpiPlan.period LIKE :period OR kpiPlan.period IS NULL)`;
parameters.year = `%${requestBody.year}%`;
parameters.period = `%${requestBody.period}%`;
}
// if (requestBody.year && requestBody.period && requestBody.isNull === true) {
// condition += ` AND (kpiPlan.year LIKE :year OR kpiPlan.year IS NULL) AND (kpiPlan.period LIKE :period OR kpiPlan.period IS NULL)`;
// parameters.year = `%${requestBody.year}%`;
// parameters.period = `%${requestBody.period}%`;
// }
const [kpiPlan, total] = await AppDataSource.getRepository(KpiPlan)
.createQueryBuilder("kpiPlan")
.leftJoinAndSelect("kpiPlan.kpiPeriod", "kpiPeriod")
.andWhere(condition, parameters)
// .andWhere(
// requestBody.year && requestBody.period
// ? "kpiPlan.year LIKE :year AND kpiPlan.period LIKE :period"
// : "1=1",
// {
// year: `%${requestBody.year}%`,
// period: `%${requestBody.period}%`,
// },
// )
.andWhere(
requestBody.isNull === false && requestBody.year && requestBody.period
? "kpiPlan.year LIKE :year AND kpiPlan.period LIKE :period"
requestBody.year
? "kpiPlan.year LIKE :year"
: "1=1",
{
year: `%${requestBody.year}%`,
},
)
.andWhere(
requestBody.period
? "kpiPlan.period LIKE :period"
: "1=1",
{
period: `%${requestBody.period}%`,
},
)

56
src/controllers/KpiRoleController.ts
View file

@ -296,8 +296,10 @@ export class kpiRoleController extends Controller {
}
const formattedData = {
id: kpiRole.id,
year: kpiRole.kpiPeriod == null ? null : kpiRole.kpiPeriod.year,
round: kpiRole.kpiPeriod == null ? null : kpiRole.kpiPeriod.durationKPI,
// year: kpiRole.kpiPeriod == null ? null : kpiRole.kpiPeriod.year,
// round: kpiRole.kpiPeriod == null ? null : kpiRole.kpiPeriod.durationKPI,
year: kpiRole.year == null ? null : kpiRole.year,
round: kpiRole.period == null ? null : kpiRole.period,
kpiPeriodId: kpiRole.kpiPeriodId,
including: kpiRole.including,
includingName: kpiRole.includingName,
@ -321,6 +323,8 @@ export class kpiRoleController extends Controller {
nodeName: nodeName,
orgRevisionId: kpiRole.orgRevisionId,
position: kpiRole.position,
documentInfoEvidence: kpiRole.documentInfoEvidence,
};
return new HttpSuccess(formattedData);
}
@ -342,9 +346,9 @@ export class kpiRoleController extends Controller {
nodeId?: string | null;
node?: number | null;
position?: string | null;
keyword?: string;
isAll?: boolean;
isNull?: boolean;
keyword?: string | null;
isAll?: boolean | false;
// isNull?: boolean | false;
},
) {
let condition = "";
@ -392,11 +396,11 @@ export class kpiRoleController extends Controller {
}
parameters.nodeId = `%${requestBody.nodeId}%`;
}
if (requestBody.year && requestBody.period && requestBody.isNull === true) {
condition += ` AND (kpiRole.year LIKE :year OR kpiRole.year IS NULL) AND (kpiRole.period LIKE :period OR kpiRole.period IS NULL)`;
parameters.year = `%${requestBody.year}%`;
parameters.period = `%${requestBody.period}%`;
}
// if (requestBody.year && requestBody.period && requestBody.isNull === true) {
// condition += ` AND (kpiRole.year LIKE :year OR kpiRole.year IS NULL) AND (kpiRole.period LIKE :period OR kpiRole.period IS NULL)`;
// parameters.year = `%${requestBody.year}%`;
// parameters.period = `%${requestBody.period}%`;
// }
const [kpiRole, total] = await AppDataSource.getRepository(KpiRole)
.createQueryBuilder("kpiRole")
.leftJoinAndSelect("kpiRole.kpiPeriod", "kpiPeriod")
@ -416,15 +420,31 @@ export class kpiRoleController extends Controller {
nodeId: requestBody.nodeId,
},
)
// .andWhere(
// requestBody.year && requestBody.period
// ? "kpiRole.year LIKE :year AND kpiRole.period LIKE :period"
// : "1=1",
// {
// year: `%${requestBody.year}%`,
// period: `%${requestBody.period}%`,
// },
// )
.andWhere(
requestBody.isNull === false && requestBody.year && requestBody.period
? "kpiRole.year LIKE :year AND kpiRole.period LIKE :period"
: "1=1",
{
year: `%${requestBody.year}%`,
period: `%${requestBody.period}%`,
},
)
requestBody.year
? "kpiRole.year LIKE :year"
: "1=1",
{
year: `%${requestBody.year}%`,
},
)
.andWhere(
requestBody.period
? "kpiRole.period LIKE :period"
: "1=1",
{
period: `%${requestBody.period}%`,
},
)
.andWhere(requestBody.position != undefined ? "kpiRole.position LIKE :position" : "1=1", {
position: `%${requestBody.position}%`,
})

2
src/controllers/KpiUserEvaluationController.ts
View file

@ -127,7 +127,7 @@ export class KpiUserEvaluationController extends Controller {
kpiUserEvaluation.lastName = x.lastName;
})
.catch((x) => {});
kpiUserEvaluation.evaluationStatus = "PENDING";
kpiUserEvaluation.evaluationStatus = "NEW";
kpiUserEvaluation.evaluationResults = "PENDING";
kpiUserEvaluation.createdUserId = request.user.sub;
kpiUserEvaluation.createdFullName = request.user.name;