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

แก้รายงานสรุปจำนวนผลงานการประเมิน

Browse source
This commit is contained in:
Bright 2025-03-18 11:32:47 +07:00
parent ce25a2ede1
commit bbf28f9d2d
3 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/EvaluationController.ts
View file

@ -444,7 +444,16 @@ export class EvaluationController {
}
const before = null;
await new CallAPI()
.GetData(request, `/org/profile/keycloak/commander/${request.user.sub}`)
.then(async (x) => {
evaluation.rootDnaId = x.rootDnaId;
evaluation.child1DnaId = x.child1DnaId;
evaluation.child2DnaId = x.child2DnaId;
evaluation.child3DnaId = x.child3DnaId;
evaluation.child4DnaId = x.child4DnaId;
})
.catch();
evaluation.step = "PREPARE_DOC_V1";
evaluation.type = requestBody.type == "EXPERT" ? "EXPERT" : "SPECIAL_EXPERT";
evaluation.fullName = requestBody.fullName;

3
src/controllers/ReportController.ts
View file

@ -76,8 +76,7 @@ export class ReoportController {
.andWhere(yearInBE && yearInBE != null ? "YEAR(createdAt) = :year" : "1=1", {
year: yearInBE,
})
.andWhere("evaluation.orgRootId = :rootId", { rootId: rootId })
// .andWhere("evaluation.rootDnaId = :rootId", { rootId: rootId })
.andWhere("evaluation.rootDnaId = :rootId", { rootId: rootId })
.andWhere("evaluation.step = :step", { step: "DONE" })
.getMany();