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

add viewProfileEmp

Browse source
This commit is contained in:
AdisakKanthawilang 2025-02-17 10:57:03 +07:00
parent db3c9583f6
commit ee71e985ab
3 changed files with 65 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/ReportController.ts
View file

@ -83,7 +83,7 @@ export class ReportController extends Controller {
.andWhere(rootId?'posMaster.orgRootId = :rootId': "1=1", { rootId: rootId })
.andWhere('posMaster.current_holderId Is Not Null')
.andWhere('positions.positionIsSelected = :positionIsSelected', { positionIsSelected: true })
.andWhere( yearInAD && yearInAD != null? 'YEAR(current_holder.dateAppoint) = :year': "1=1", { year: yearInAD })
.andWhere( yearInAD && yearInAD != null? 'YEAR(current_holder.dateAppoint) = :year': "1=1", { year: yearInAD }) //ตอนนี้ where ที่วันที่บรรจุ (รอ prove) ว่าจะ where ที่ไหน
.andWhere(`
TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) >= :minAge
AND TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) <= :maxAge
@ -137,12 +137,11 @@ export class ReportController extends Controller {
...item ,
count: Extension.ToThaiNumber(item.count.toString()),
}));
return new HttpSuccess({
template: "registry-officer",
reportName: "xlsx-report",
data: {
year: year?Extension.ToThaiNumber(year.toString()):Extension.ToThaiNumber(new Date().getFullYear().toString()),
year: year?Extension.ToThaiNumber((year + 543).toString()):Extension.ToThaiNumber(((new Date()).getFullYear()+543).toString()),
date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
list: result
},
@ -248,7 +247,7 @@ export class ReportController extends Controller {
template: "registry-emp",
reportName: "xlsx-report",
data: {
year: year?Extension.ToThaiNumber(year.toString()):Extension.ToThaiNumber(new Date().getFullYear().toString()),
year: year?Extension.ToThaiNumber((year + 543).toString()):Extension.ToThaiNumber(((new Date()).getFullYear()+543).toString()),
date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
list: result
},