update
This commit is contained in:
Bright
parent
935ec5dae2
commit
c5c8ccd8c0
4 changed files with 296 additions and 172 deletions
|
|
@ -260,7 +260,7 @@ export class ReportController extends Controller {
|
|||
if (tenureType != "" && tenureType == "position") {
|
||||
tenureTypeCondition = "registryOfficer.Years BETWEEN :tenureMin AND :tenureMax";
|
||||
} else if (tenureType != "" && tenureType == "level") {
|
||||
tenureTypeCondition = "registryOfficer.levelYears BETWEEN :tenureMin AND :tenureMax"; //xxxxxxxxxxxx
|
||||
tenureTypeCondition = "registryOfficer.levelYears BETWEEN :tenureMin AND :tenureMax";
|
||||
}
|
||||
|
||||
const [lists, total] = await AppDataSource.getRepository(viewRegistryOfficer)
|
||||
|
|
@ -338,83 +338,58 @@ export class ReportController extends Controller {
|
|||
.orderBy(`registryOfficer.${sortBy}`, sort)
|
||||
.getManyAndCount();
|
||||
|
||||
const mapData = await Promise.all(lists.map(async(x) => {
|
||||
const position = await AppDataSource.query("CALL GetProfileSalaryPosition(?)", [x.profileId])
|
||||
const _position = position.length > 0 ? position[0] : [];
|
||||
const lastPosition = _position.length > 0 ? _position[_position.length - 1] : null; // last row
|
||||
const mapPosition = lastPosition
|
||||
? [{
|
||||
Years: lastPosition.Years ? Math.floor(Number(lastPosition.Years)) : 0,
|
||||
Months: lastPosition.Months ? Math.floor(Number(lastPosition.Months)) : 0,
|
||||
Daysday: lastPosition.Days ? Math.floor(Number(lastPosition.Days)) : 0,
|
||||
}]
|
||||
: [];
|
||||
const posLevel = await AppDataSource.query("CALL GetProfileSalaryLevel(?)", [x.profileId])
|
||||
const _posLevel = posLevel.length > 0 ? posLevel[0] : [];
|
||||
const lastPosLevel= _posLevel.length > 0 ? _posLevel[_posLevel.length - 1] : null;
|
||||
const mapPosLevel = lastPosLevel
|
||||
? [{
|
||||
Years: lastPosLevel.Years ? Math.floor(Number(lastPosLevel.Years)) : 0,
|
||||
Months: lastPosLevel.Months ? Math.floor(Number(lastPosLevel.Months)) : 0,
|
||||
Daysday: lastPosLevel.Days ? Math.floor(Number(lastPosLevel.Days)) : 0,
|
||||
}]
|
||||
: [];
|
||||
return {
|
||||
profileId: x.profileId,
|
||||
citizenId: x.citizenId,
|
||||
prefix: x.prefix,
|
||||
firstName: x.firstName,
|
||||
lastName: x.lastName,
|
||||
isProbation: x.isProbation,
|
||||
isLeave: x.isLeave,
|
||||
isRetirement: x.isRetirement,
|
||||
leaveType: x.leaveType,
|
||||
posMasterNo: x.posMasterNo,
|
||||
orgRootId: x.orgRootId,
|
||||
orgChild1Id: x.orgChild1Id,
|
||||
orgChild2Id: x.orgChild2Id,
|
||||
orgChild3Id: x.orgChild3Id,
|
||||
orgChild4Id: x.orgChild4Id,
|
||||
orgRootName: x.orgRootName,
|
||||
orgChild1Name: x.orgChild1Name,
|
||||
orgChild2Name: x.orgChild2Name,
|
||||
orgChild3Name: x.orgChild3Name,
|
||||
orgChild4Name: x.orgChild4Name,
|
||||
org: x.org,
|
||||
searchShortName: x.searchShortName,
|
||||
posExecutiveName: x.posExecutiveName,
|
||||
position: x.position,
|
||||
posTypeName: x.posTypeName,
|
||||
posLevelName: x.posLevelName,
|
||||
gender: x.gender,
|
||||
relationship: x.relationship,
|
||||
dateAppoint: x.dateAppoint,
|
||||
dateRetire: x.dateRetire,
|
||||
dateRetireLaw: x.dateRetireLaw,
|
||||
birthdate: x.birthdate,
|
||||
degree: x.degree,
|
||||
age: x.age,
|
||||
currentPosition: null,
|
||||
lengthPosition: null,
|
||||
// positionDate: {
|
||||
// Years: x.Years,
|
||||
// Months: x.Months,
|
||||
// Days: x.Days,
|
||||
// },
|
||||
// posExcutiveDate: {
|
||||
// Years: x.posExecutiveYears,
|
||||
// Months: x.posExecutiveMonths,
|
||||
// Days: x.posExecutiveDays,
|
||||
// },
|
||||
// posLevelDate: {
|
||||
// Years: x.levelYears,
|
||||
// Months: x.levelMonths,
|
||||
// Days: x.levelDays,
|
||||
// },
|
||||
positionDate: mapPosition,
|
||||
posLevelDate: mapPosLevel
|
||||
const mapData = await Promise.all(
|
||||
lists.map(async(x) => {
|
||||
return {
|
||||
profileId: x.profileId,
|
||||
citizenId: x.citizenId,
|
||||
prefix: x.prefix,
|
||||
firstName: x.firstName,
|
||||
lastName: x.lastName,
|
||||
isProbation: x.isProbation,
|
||||
isLeave: x.isLeave,
|
||||
isRetirement: x.isRetirement,
|
||||
leaveType: x.leaveType,
|
||||
posMasterNo: x.posMasterNo,
|
||||
orgRootId: x.orgRootId,
|
||||
orgChild1Id: x.orgChild1Id,
|
||||
orgChild2Id: x.orgChild2Id,
|
||||
orgChild3Id: x.orgChild3Id,
|
||||
orgChild4Id: x.orgChild4Id,
|
||||
orgRootName: x.orgRootName,
|
||||
orgChild1Name: x.orgChild1Name,
|
||||
orgChild2Name: x.orgChild2Name,
|
||||
orgChild3Name: x.orgChild3Name,
|
||||
orgChild4Name: x.orgChild4Name,
|
||||
org: x.org,
|
||||
searchShortName: x.searchShortName,
|
||||
posExecutiveName: x.posExecutiveName,
|
||||
position: x.position,
|
||||
posTypeName: x.posTypeName,
|
||||
posLevelName: x.posLevelName,
|
||||
gender: x.gender,
|
||||
relationship: x.relationship,
|
||||
dateAppoint: x.dateAppoint,
|
||||
dateRetire: x.dateRetire,
|
||||
dateRetireLaw: x.dateRetireLaw,
|
||||
birthdate: x.birthdate,
|
||||
degree: x.degree,
|
||||
age: x.age,
|
||||
currentPosition: null,
|
||||
lengthPosition: null,
|
||||
positionDate: {
|
||||
Years: x.Years,
|
||||
Months: x.Months,
|
||||
Days: x.Days,
|
||||
},
|
||||
posLevelDate: {
|
||||
Years: x.levelYears,
|
||||
Months: x.levelMonths,
|
||||
Days: x.levelDays,
|
||||
},
|
||||
}
|
||||
}
|
||||
}));
|
||||
));
|
||||
return new HttpSuccess({
|
||||
data: mapData,
|
||||
total: total,
|
||||
|
|
@ -613,6 +588,13 @@ export class ReportController extends Controller {
|
|||
parameters.retireType = retireType;
|
||||
}
|
||||
|
||||
let tenureTypeCondition = "1=1";
|
||||
if (tenureType != "" && tenureType == "position") {
|
||||
tenureTypeCondition = "registryEmployee.Years BETWEEN :tenureMin AND :tenureMax";
|
||||
} else if (tenureType != "" && tenureType == "level") {
|
||||
tenureTypeCondition = "registryEmployee.levelYears BETWEEN :tenureMin AND :tenureMax";
|
||||
}
|
||||
|
||||
let retireLawCondition = "1=1";
|
||||
if (isRetireLaw) {
|
||||
retireLawCondition =
|
||||
|
|
@ -624,6 +606,10 @@ export class ReportController extends Controller {
|
|||
.where(nodeCondition, {
|
||||
nodeId: nodeId,
|
||||
})
|
||||
.andWhere(tenureTypeCondition, {
|
||||
tenureMin: tenureMin,
|
||||
tenureMax: tenureMax,
|
||||
})
|
||||
.andWhere("registryEmployee.age BETWEEN :ageMin AND :ageMax", {
|
||||
ageMin,
|
||||
ageMax,
|
||||
|
|
@ -683,67 +669,57 @@ export class ReportController extends Controller {
|
|||
.orderBy(`registryEmployee.${sortBy}`, sort)
|
||||
.getManyAndCount();
|
||||
|
||||
const mapData = await Promise.all(lists.map(async(x) => {
|
||||
const position = await AppDataSource.query("CALL GetProfileEmployeeSalaryPosition(?)", [x.profileEmployeeId])
|
||||
const _position = position.length > 0 ? position[0] : [];
|
||||
const lastPosition = _position.length > 0 ? _position[_position.length - 1] : null;
|
||||
const mapPosition = lastPosition
|
||||
? [{
|
||||
Years: lastPosition.Years ? Math.floor(Number(lastPosition.Years)) : 0,
|
||||
Months: lastPosition.Months ? Math.floor(Number(lastPosition.Months)) : 0,
|
||||
Daysday: lastPosition.Days ? Math.floor(Number(lastPosition.Days)) : 0,
|
||||
}]
|
||||
: [];
|
||||
const posLevel = await AppDataSource.query("CALL GetProfileEmployeeSalaryLevel(?)", [x.profileEmployeeId])
|
||||
const _posLevel = posLevel.length > 0 ? posLevel[0] : [];
|
||||
const lastPosLevel= _posLevel.length > 0 ? _posLevel[_posLevel.length - 1] : null;
|
||||
const mapPosLevel = lastPosLevel
|
||||
? [{
|
||||
Years: lastPosLevel.Years ? Math.floor(Number(lastPosLevel.Years)) : 0,
|
||||
Months: lastPosLevel.Months ? Math.floor(Number(lastPosLevel.Months)) : 0,
|
||||
Daysday: lastPosLevel.Days ? Math.floor(Number(lastPosLevel.Days)) : 0,
|
||||
}]
|
||||
: [];
|
||||
return {
|
||||
profileId: x.profileEmployeeId,
|
||||
citizenId: x.citizenId,
|
||||
prefix: x.prefix,
|
||||
firstName: x.firstName,
|
||||
lastName: x.lastName,
|
||||
isProbation: x.isProbation,
|
||||
isLeave: x.isLeave,
|
||||
isRetirement: x.isRetirement,
|
||||
leaveType: x.leaveType,
|
||||
posMasterNo: x.posMasterNo,
|
||||
orgRootId: x.orgRootId,
|
||||
orgChild1Id: x.orgChild1Id,
|
||||
orgChild2Id: x.orgChild2Id,
|
||||
orgChild3Id: x.orgChild3Id,
|
||||
orgChild4Id: x.orgChild4Id,
|
||||
orgRootName: x.orgRootName,
|
||||
orgChild1Name: x.orgChild1Name,
|
||||
orgChild2Name: x.orgChild2Name,
|
||||
orgChild3Name: x.orgChild3Name,
|
||||
orgChild4Name: x.orgChild4Name,
|
||||
org: x.org,
|
||||
searchShortName: x.searchShortName,
|
||||
position: x.position,
|
||||
posTypeName: x.posTypeName,
|
||||
posLevelName: x.posLevelName,
|
||||
gender: x.gender,
|
||||
relationship: x.relationship,
|
||||
dateAppoint: x.dateAppoint,
|
||||
dateRetire: x.dateRetire,
|
||||
dateRetireLaw: x.dateRetireLaw,
|
||||
birthdate: x.birthdate,
|
||||
degree: x.degree,
|
||||
age: x.age,
|
||||
currentPosition: null,
|
||||
lengthPosition: null,
|
||||
positionDate: mapPosition,
|
||||
posLevelDate: mapPosLevel
|
||||
const mapData = await Promise.all(
|
||||
lists.map(async(x) => {
|
||||
return {
|
||||
profileId: x.profileEmployeeId,
|
||||
citizenId: x.citizenId,
|
||||
prefix: x.prefix,
|
||||
firstName: x.firstName,
|
||||
lastName: x.lastName,
|
||||
isProbation: x.isProbation,
|
||||
isLeave: x.isLeave,
|
||||
isRetirement: x.isRetirement,
|
||||
leaveType: x.leaveType,
|
||||
posMasterNo: x.posMasterNo,
|
||||
orgRootId: x.orgRootId,
|
||||
orgChild1Id: x.orgChild1Id,
|
||||
orgChild2Id: x.orgChild2Id,
|
||||
orgChild3Id: x.orgChild3Id,
|
||||
orgChild4Id: x.orgChild4Id,
|
||||
orgRootName: x.orgRootName,
|
||||
orgChild1Name: x.orgChild1Name,
|
||||
orgChild2Name: x.orgChild2Name,
|
||||
orgChild3Name: x.orgChild3Name,
|
||||
orgChild4Name: x.orgChild4Name,
|
||||
org: x.org,
|
||||
searchShortName: x.searchShortName,
|
||||
position: x.position,
|
||||
posTypeName: x.posTypeName,
|
||||
posLevelName: x.posLevelName,
|
||||
gender: x.gender,
|
||||
relationship: x.relationship,
|
||||
dateAppoint: x.dateAppoint,
|
||||
dateRetire: x.dateRetire,
|
||||
dateRetireLaw: x.dateRetireLaw,
|
||||
birthdate: x.birthdate,
|
||||
degree: x.degree,
|
||||
age: x.age,
|
||||
currentPosition: null,
|
||||
lengthPosition: null,
|
||||
positionDate: {
|
||||
Years: x.Years,
|
||||
Months: x.Months,
|
||||
Days: x.Days,
|
||||
},
|
||||
posLevelDate: {
|
||||
Years: x.levelYears,
|
||||
Months: x.levelMonths,
|
||||
Days: x.levelDays,
|
||||
},
|
||||
}
|
||||
}
|
||||
}));
|
||||
));
|
||||
return new HttpSuccess({
|
||||
data: mapData,
|
||||
total: total,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue