thai number 984(1)
This commit is contained in:
parent
f873f458f6
commit
4077900079
1 changed files with 9 additions and 5 deletions
|
|
@ -46,7 +46,7 @@ export class ReportController extends Controller {
|
||||||
@Get("registry-officer")
|
@Get("registry-officer")
|
||||||
async registryOfficer(
|
async registryOfficer(
|
||||||
@Query() rootId: string,
|
@Query() rootId: string,
|
||||||
@Query() year?: number,
|
@Query() year: number,
|
||||||
@Query() ageMin?: number,
|
@Query() ageMin?: number,
|
||||||
@Query() ageMax?: number,
|
@Query() ageMax?: number,
|
||||||
) {
|
) {
|
||||||
|
|
@ -135,13 +135,15 @@ export class ReportController extends Controller {
|
||||||
|
|
||||||
const result = Object.values(groupedData).map((item: any) => ({
|
const result = Object.values(groupedData).map((item: any) => ({
|
||||||
...item ,
|
...item ,
|
||||||
count: item.count
|
count: Extension.ToThaiNumber(item.count.toString()),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
template: "registry-officer",
|
template: "registry-officer",
|
||||||
reportName: "xlsx-report",
|
reportName: "xlsx-report",
|
||||||
data: {
|
data: {
|
||||||
|
year: Extension.ToThaiNumber(year.toString()),
|
||||||
|
date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
|
||||||
list: result
|
list: result
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
@ -155,7 +157,7 @@ export class ReportController extends Controller {
|
||||||
@Get("registry-emp")
|
@Get("registry-emp")
|
||||||
async registryEmp(
|
async registryEmp(
|
||||||
@Query() rootId: string,
|
@Query() rootId: string,
|
||||||
@Query() year?: number,
|
@Query() year: number,
|
||||||
@Query() ageMin?: number,
|
@Query() ageMin?: number,
|
||||||
@Query() ageMax?: number,
|
@Query() ageMax?: number,
|
||||||
) {
|
) {
|
||||||
|
|
@ -227,7 +229,7 @@ export class ReportController extends Controller {
|
||||||
status: item.status && item.status != ""?item.status:"-",
|
status: item.status && item.status != ""?item.status:"-",
|
||||||
posType: item.posType && item.posType != ""?item.posType:"-",
|
posType: item.posType && item.posType != ""?item.posType:"-",
|
||||||
positionName: item.positionName && item.positionName != ""?item.positionName:"-",
|
positionName: item.positionName && item.positionName != ""?item.positionName:"-",
|
||||||
posLevel: item.posLevel,
|
posLevel: Extension.ToThaiNumber(item.posLevel.toString()),
|
||||||
period: "-",
|
period: "-",
|
||||||
count: 0,
|
count: 0,
|
||||||
};
|
};
|
||||||
|
|
@ -239,13 +241,15 @@ export class ReportController extends Controller {
|
||||||
|
|
||||||
const result = Object.values(groupedData).map((item: any) => ({
|
const result = Object.values(groupedData).map((item: any) => ({
|
||||||
...item ,
|
...item ,
|
||||||
count: item.count
|
count: Extension.ToThaiNumber(item.count.toString())
|
||||||
}));
|
}));
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
template: "registry-emp",
|
template: "registry-emp",
|
||||||
reportName: "xlsx-report",
|
reportName: "xlsx-report",
|
||||||
data: {
|
data: {
|
||||||
|
year: Extension.ToThaiNumber(year.toString()),
|
||||||
|
date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
|
||||||
list: result
|
list: result
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue