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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2025-02-10 18:29:52 +07:00
parent 75cbef694a
commit 970662662f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/ReportController.ts
View file

@ -63,11 +63,12 @@ export class ReoportController {
const yearInAD = year?year:null; const yearInAD = year?year:null;
const yearInBE = yearInAD ? (parseInt(yearInAD) - 543).toString() : null; const yearInBE = yearInAD ? (parseInt(yearInAD) - 543).toString() : null;
const evaluation = await AppDataSource.getRepository(Evaluation) let evaluation = [];
evaluation = await AppDataSource.getRepository(Evaluation)
.createQueryBuilder("evaluation") .createQueryBuilder("evaluation")
.where('evaluation.evaluationResult NOT IN (:...evaluationResults)', { evaluationResults: ['PENDING'] }) .where('evaluation.evaluationResult NOT IN (:...evaluationResults)', { evaluationResults: ['PENDING'] })
.andWhere( yearInBE && yearInBE != null? 'YEAR(createdAt) = :year': "1=1", { year: yearInBE }) .andWhere( yearInBE && yearInBE != null? 'YEAR(createdAt) = :year': "1=1", { year: yearInBE })
.andWhere(rootId?'orgRootId = :rootId': "1=1", { rootId: rootId }) .andWhere('evaluation.orgRootId = :rootId',{ rootId: rootId })
.andWhere('evaluation.step = :step', { step: 'DONE' }) .andWhere('evaluation.step = :step', { step: 'DONE' })
.getMany(); .getMany();
@ -114,7 +115,7 @@ export class ReoportController {
data: { data: {
year: year?Extension.ToThaiNumber(year.toString()):Extension.ToThaiNumber(new Date().getFullYear().toString()), year: year?Extension.ToThaiNumber(year.toString()):Extension.ToThaiNumber(new Date().getFullYear().toString()),
date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())), date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
mainAgency: rootId && result.length > 0?result[0].agency:"ทุกสำนักงานเขต", mainAgency: rootId && result.length > 0?result[0].agency:"",
list: result, list: result,
total: Extension.ToThaiNumber(submitter.toString()), total: Extension.ToThaiNumber(submitter.toString()),
sumPass: Extension.ToThaiNumber(sumPass.toString()), sumPass: Extension.ToThaiNumber(sumPass.toString()),