update #1406
This commit is contained in:
parent
bbb8eeb278
commit
ef7a8bc0e8
2 changed files with 9 additions and 0 deletions
|
|
@ -348,6 +348,9 @@ export class ProfileSalaryController extends Controller {
|
||||||
.filter(x => profileIds.has(x.profileId))
|
.filter(x => profileIds.has(x.profileId))
|
||||||
.map(x => ({
|
.map(x => ({
|
||||||
...x,
|
...x,
|
||||||
|
isProbation: Boolean(x.isProbation),
|
||||||
|
isLeave: Boolean(x.isLeave),
|
||||||
|
isRetirement: Boolean(x.isRetirement),
|
||||||
Educations: x.Educations ? JSON.stringify(x.Educations) : "",
|
Educations: x.Educations ? JSON.stringify(x.Educations) : "",
|
||||||
}));
|
}));
|
||||||
if (mapData.length > 0) {
|
if (mapData.length > 0) {
|
||||||
|
|
@ -367,6 +370,9 @@ export class ProfileSalaryController extends Controller {
|
||||||
.filter(x => profileEmpIds.has(x.profileEmployeeId))
|
.filter(x => profileEmpIds.has(x.profileEmployeeId))
|
||||||
.map(x => ({
|
.map(x => ({
|
||||||
...x,
|
...x,
|
||||||
|
isProbation: Boolean(x.isProbation),
|
||||||
|
isLeave: Boolean(x.isLeave),
|
||||||
|
isRetirement: Boolean(x.isRetirement),
|
||||||
Educations: x.Educations ? JSON.stringify(x.Educations) : "",
|
Educations: x.Educations ? JSON.stringify(x.Educations) : "",
|
||||||
}));
|
}));
|
||||||
if (mapData.length > 0) {
|
if (mapData.length > 0) {
|
||||||
|
|
|
||||||
|
|
@ -298,4 +298,7 @@ export class viewRegistryEmployee {
|
||||||
|
|
||||||
@ViewColumn()
|
@ViewColumn()
|
||||||
fields: string;
|
fields: string;
|
||||||
|
|
||||||
|
@ViewColumn()
|
||||||
|
employeeClass: string;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue