fix report
This commit is contained in:
parent
9b38c216a3
commit
7a83b0ab98
1 changed files with 313 additions and 101 deletions
|
|
@ -40,20 +40,12 @@ export class ReportController extends Controller {
|
||||||
|
|
||||||
//KPI1, KPI2, KPI3, KPI7, KPI9
|
//KPI1, KPI2, KPI3, KPI7, KPI9
|
||||||
let data: any;
|
let data: any;
|
||||||
|
|
||||||
let dataKpiUserEvaluations: any;
|
let dataKpiUserEvaluations: any;
|
||||||
let period1: any;
|
let period1: any;
|
||||||
let period2: any;
|
let period2: any;
|
||||||
|
let rootName: any
|
||||||
if (requestBody.root && requestBody.periodId) {
|
if (requestBody.root && requestBody.periodId) {
|
||||||
// data = await this.kpiPeriodRepository.createQueryBuilder("period")
|
|
||||||
// .leftJoinAndSelect("period.kpiUserEvaluations", "kpiUserEvaluations")
|
|
||||||
// .where("period.id = :periodId", { periodId: requestBody.periodId })
|
|
||||||
// .andWhere("kpiUserEvaluations.orgId = :orgId", { orgId: requestBody.root })
|
|
||||||
// .getOne();
|
|
||||||
|
|
||||||
// if(data == null || data == undefined){
|
|
||||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, `ไม่พบข้อมูลรายการประเมินผลการปฏิบัติราชการ ของหน่วยงานที่เลือก`);
|
|
||||||
// }
|
|
||||||
data = await this.kpiPeriodRepository.findOne({
|
data = await this.kpiPeriodRepository.findOne({
|
||||||
where: { id: requestBody.periodId },
|
where: { id: requestBody.periodId },
|
||||||
});
|
});
|
||||||
|
|
@ -64,6 +56,11 @@ export class ReportController extends Controller {
|
||||||
evaluationStatus: "KP7",
|
evaluationStatus: "KP7",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
await new CallAPI()
|
||||||
|
.GetData(request, `org/root/${requestBody.root}`)
|
||||||
|
.then((x) => {
|
||||||
|
rootName = x.orgRootName;
|
||||||
|
});
|
||||||
data = {
|
data = {
|
||||||
id: data.id,
|
id: data.id,
|
||||||
year: data.year,
|
year: data.year,
|
||||||
|
|
@ -71,6 +68,7 @@ export class ReportController extends Controller {
|
||||||
startDate: data.startDate,
|
startDate: data.startDate,
|
||||||
endDate: data.endDate,
|
endDate: data.endDate,
|
||||||
kpiUserEvaluations: dataKpiUserEvaluations,
|
kpiUserEvaluations: dataKpiUserEvaluations,
|
||||||
|
rootName: rootName
|
||||||
};
|
};
|
||||||
|
|
||||||
if (data.durationKPI == "APR") {
|
if (data.durationKPI == "APR") {
|
||||||
|
|
@ -108,10 +106,6 @@ export class ReportController extends Controller {
|
||||||
where: {
|
where: {
|
||||||
orgId: String(requestBody?.root),
|
orgId: String(requestBody?.root),
|
||||||
kpiPeriodId: String(requestBody?.periodId),
|
kpiPeriodId: String(requestBody?.periodId),
|
||||||
// child1Id: "" || IsNull(),
|
|
||||||
// child2Id: "" || IsNull(),
|
|
||||||
// child3Id: "" || IsNull(),
|
|
||||||
// child4Id: "" || IsNull(),
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
const resultAll =
|
const resultAll =
|
||||||
|
|
@ -177,22 +171,29 @@ export class ReportController extends Controller {
|
||||||
period2: Extension.ToThaiNumber(period2),
|
period2: Extension.ToThaiNumber(period2),
|
||||||
durationKPI: data?.durationKPI,
|
durationKPI: data?.durationKPI,
|
||||||
root:
|
root:
|
||||||
data?.kpiUserEvaluations != null && data?.kpiUserEvaluations.length > 0
|
data && data.rootName != null
|
||||||
? data?.kpiUserEvaluations[0].orgEvaluator
|
? data.rootName
|
||||||
: "-",
|
: "-",
|
||||||
userEvaluations: [
|
userEvaluations: [
|
||||||
{
|
{
|
||||||
no: userEvaluationOrg.length > 0 ? "๑" : "",
|
no: userEvaluationOrg.length > 0 ? "๑" : "-",
|
||||||
root: userEvaluationOrg.length > 0 ? userEvaluationOrg[0].orgEvaluator ?? "" : "-",
|
root: data && data.rootName != null ? data.rootName : "-",
|
||||||
resultAll: userEvaluationOrg.length > 0 ? resultAll : "",
|
resultAll: userEvaluationOrg.length > 0 ? resultAll : "-",
|
||||||
result: userEvaluationOrg.length > 0 ? result : "",
|
result: userEvaluationOrg.length > 0 ? result : "-",
|
||||||
excellent: userEvaluationOrg.length > 0 ? excellent : "",
|
excellent: userEvaluationOrg.length > 0 ? excellent : "-",
|
||||||
verygood: userEvaluationOrg.length > 0 ? verygood : "",
|
verygood: userEvaluationOrg.length > 0 ? verygood : "-",
|
||||||
good: userEvaluationOrg.length > 0 ? good : "",
|
good: userEvaluationOrg.length > 0 ? good : "-",
|
||||||
fair: userEvaluationOrg.length > 0 ? fair : "",
|
fair: userEvaluationOrg.length > 0 ? fair : "-",
|
||||||
improvment: userEvaluationOrg.length > 0 ? improvment : "",
|
improvment: userEvaluationOrg.length > 0 ? improvment : "-",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
resultAll_: userEvaluationOrg.length > 0 ? resultAll : "-",
|
||||||
|
result_: userEvaluationOrg.length > 0 ? result : "-",
|
||||||
|
excellent_: userEvaluationOrg.length > 0 ? excellent : "-",
|
||||||
|
verygood_: userEvaluationOrg.length > 0 ? verygood : "-",
|
||||||
|
good_: userEvaluationOrg.length > 0 ? good : "-",
|
||||||
|
fair_: userEvaluationOrg.length > 0 ? fair : "-",
|
||||||
|
improvment_: userEvaluationOrg.length > 0 ? improvment : "-",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (requestBody.type == "KPI2") {
|
if (requestBody.type == "KPI2") {
|
||||||
|
|
@ -204,103 +205,172 @@ export class ReportController extends Controller {
|
||||||
.filter((x: any) => x.evaluationResults == "EXCELLENT")
|
.filter((x: any) => x.evaluationResults == "EXCELLENT")
|
||||||
.map((x: any, idx: number) => ({
|
.map((x: any, idx: number) => ({
|
||||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
fullName: x.prefix!=null&&x.firstName!=null&&x.lastName!=null
|
||||||
position: x.position ? x.position : "",
|
? `${x.prefix}${x.firstName} ${x.lastName}`
|
||||||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
: "-",
|
||||||
org: x.org ? x.org : "",
|
position: x.position ? x.position : "-",
|
||||||
|
posLevelName: x.posLevelName ? x.posLevelName : "-",
|
||||||
|
org: x.org ? x.org : "-",
|
||||||
}))
|
}))
|
||||||
: [{}];
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}];
|
||||||
const verygood =
|
const verygood =
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? data.kpiUserEvaluations
|
? data.kpiUserEvaluations
|
||||||
.filter((x: any) => x.evaluationResults == "VERY_GOOD")
|
.filter((x: any) => x.evaluationResults == "VERY_GOOD")
|
||||||
.map((x: any, idx: number) => ({
|
.map((x: any, idx: number) => ({
|
||||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
fullName: x.prefix!=null&&x.firstName!=null&&x.lastName!=null
|
||||||
position: x.position ? x.position : "",
|
? `${x.prefix}${x.firstName} ${x.lastName}`
|
||||||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
: "-",
|
||||||
org: x.org ? x.org : "",
|
position: x.position ? x.position : "-",
|
||||||
|
posLevelName: x.posLevelName ? x.posLevelName : "-",
|
||||||
|
org: x.org ? x.org : "-",
|
||||||
}))
|
}))
|
||||||
: [{}];
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}];
|
||||||
const good =
|
const good =
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? data.kpiUserEvaluations
|
? data.kpiUserEvaluations
|
||||||
.filter((x: any) => x.evaluationResults == "GOOD")
|
.filter((x: any) => x.evaluationResults == "GOOD")
|
||||||
.map((x: any, idx: number) => ({
|
.map((x: any, idx: number) => ({
|
||||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
fullName: x.prefix!=null&&x.firstName!=null&&x.lastName!=null
|
||||||
position: x.position ? x.position : "",
|
? `${x.prefix}${x.firstName} ${x.lastName}`
|
||||||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
: "-",
|
||||||
org: x.org ? x.org : "",
|
position: x.position ? x.position : "-",
|
||||||
|
posLevelName: x.posLevelName ? x.posLevelName : "-",
|
||||||
|
org: x.org ? x.org : "-",
|
||||||
}))
|
}))
|
||||||
: [{}];
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}];
|
||||||
const fair =
|
const fair =
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? data.kpiUserEvaluations
|
? data.kpiUserEvaluations
|
||||||
.filter((x: any) => x.evaluationResults == "FAIR")
|
.filter((x: any) => x.evaluationResults == "FAIR")
|
||||||
.map((x: any, idx: number) => ({
|
.map((x: any, idx: number) => ({
|
||||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
fullName: x.prefix!=null&&x.firstName!=null&&x.lastName!=null
|
||||||
position: x.position ? x.position : "",
|
? `${x.prefix}${x.firstName} ${x.lastName}`
|
||||||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
: "-",
|
||||||
org: x.org ? x.org : "",
|
position: x.position ? x.position : "-",
|
||||||
|
posLevelName: x.posLevelName ? x.posLevelName : "-",
|
||||||
|
org: x.org ? x.org : "-",
|
||||||
}))
|
}))
|
||||||
: [{}];
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}];
|
||||||
const improvment =
|
const improvment =
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? data.kpiUserEvaluations
|
? data.kpiUserEvaluations
|
||||||
.filter((x: any) => x.evaluationResults == "IMPROVEMENT")
|
.filter((x: any) => x.evaluationResults == "IMPROVEMENT")
|
||||||
.map((x: any, idx: number) => ({
|
.map((x: any, idx: number) => ({
|
||||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
fullName: x.prefix!=null&&x.firstName!=null&&x.lastName!=null
|
||||||
position: x.position ? x.position : "",
|
? `${x.prefix}${x.firstName} ${x.lastName}`
|
||||||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
: "-",
|
||||||
org: x.org ? x.org : "",
|
position: x.position ? x.position : "-",
|
||||||
|
posLevelName: x.posLevelName ? x.posLevelName : "-",
|
||||||
|
org: x.org ? x.org : "-",
|
||||||
}))
|
}))
|
||||||
: [{}];
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}];
|
||||||
formattedData = {
|
formattedData = {
|
||||||
year: data?.year ? Extension.ToThaiNumber((data.year + 543).toString()) : "-",
|
year: data?.year ? Extension.ToThaiNumber((data.year + 543).toString()) : "-",
|
||||||
period1: Extension.ToThaiNumber(period1),
|
period1: Extension.ToThaiNumber(period1),
|
||||||
period2: Extension.ToThaiNumber(period2),
|
period2: Extension.ToThaiNumber(period2),
|
||||||
durationKPI: data?.durationKPI,
|
durationKPI: data?.durationKPI,
|
||||||
root:
|
root: data && data.rootName != null
|
||||||
data?.kpiUserEvaluations != null && data?.kpiUserEvaluations.length > 0
|
? data.rootName
|
||||||
? data?.kpiUserEvaluations[0].orgEvaluator
|
|
||||||
: "-",
|
: "-",
|
||||||
excellents: {
|
excellents: {
|
||||||
count:
|
count:
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? Extension.ToThaiNumber(excellent.length.toString())
|
? Extension.ToThaiNumber(excellent.length.toString())
|
||||||
: "",
|
: "๐",
|
||||||
data: excellent,
|
data: excellent.length > 0 ? excellent : [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}],
|
||||||
},
|
},
|
||||||
verygoods: {
|
verygoods: {
|
||||||
count:
|
count:
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? Extension.ToThaiNumber(verygood.length.toString())
|
? Extension.ToThaiNumber(verygood.length.toString())
|
||||||
: "",
|
: "๐",
|
||||||
data: verygood,
|
data: verygood.length > 0 ? verygood : [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}],
|
||||||
},
|
},
|
||||||
goods: {
|
goods: {
|
||||||
count:
|
count:
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? Extension.ToThaiNumber(good.length.toString())
|
? Extension.ToThaiNumber(good.length.toString())
|
||||||
: "",
|
: "๐",
|
||||||
data: good,
|
data: good.length > 0 ? good : [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}],
|
||||||
},
|
},
|
||||||
fairs: {
|
fairs: {
|
||||||
count:
|
count:
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? Extension.ToThaiNumber(fair.length.toString())
|
? Extension.ToThaiNumber(fair.length.toString())
|
||||||
: "",
|
: "๐",
|
||||||
data: fair,
|
data: fair.length > 0 ? fair : [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}],
|
||||||
},
|
},
|
||||||
improvments: {
|
improvments: {
|
||||||
count:
|
count:
|
||||||
data.kpiUserEvaluations.length > 0
|
data.kpiUserEvaluations.length > 0
|
||||||
? Extension.ToThaiNumber(improvment.length.toString())
|
? Extension.ToThaiNumber(improvment.length.toString())
|
||||||
: "",
|
: "๐",
|
||||||
data: improvment,
|
data: improvment.length > 0 ? improvment : [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
org: "-",
|
||||||
|
}],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -310,28 +380,44 @@ export class ReportController extends Controller {
|
||||||
const userEvaluations_ =
|
const userEvaluations_ =
|
||||||
data?.kpiUserEvaluations?.length > 0
|
data?.kpiUserEvaluations?.length > 0
|
||||||
? data.kpiUserEvaluations.map((x: any, idx: number) => ({
|
? data.kpiUserEvaluations.map((x: any, idx: number) => ({
|
||||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
no: idx != null ?Extension.ToThaiNumber((idx + 1).toString()) : "-",
|
||||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
fullName: x.prefix != null && x.firstName != null && x.lastName != null
|
||||||
position: x.position ? x.position : "",
|
? `${x.prefix}${x.firstName} ${x.lastName}`
|
||||||
|
: "-",
|
||||||
|
position: x.position ? x.position : "-",
|
||||||
point1:
|
point1:
|
||||||
x.summaryPoint >= 90.0 ? Extension.ToThaiNumber(x.summaryPoint.toString()) : "",
|
x.summaryPoint >= 90.0
|
||||||
|
? Extension.ToThaiNumber(x.summaryPoint.toString())
|
||||||
|
: "-",
|
||||||
point2:
|
point2:
|
||||||
x.summaryPoint >= 80.0 && x.summaryPoint <= 89.99
|
x.summaryPoint >= 80.0 && x.summaryPoint <= 89.99
|
||||||
? Extension.ToThaiNumber(x.summaryPoint.toString())
|
? Extension.ToThaiNumber(x.summaryPoint.toString())
|
||||||
: "",
|
: "-",
|
||||||
point3:
|
point3:
|
||||||
x.summaryPoint >= 70.0 && x.summaryPoint <= 79.99
|
x.summaryPoint >= 70.0 && x.summaryPoint <= 79.99
|
||||||
? Extension.ToThaiNumber(x.summaryPoint.toString())
|
? Extension.ToThaiNumber(x.summaryPoint.toString())
|
||||||
: "",
|
: "-",
|
||||||
point4:
|
point4:
|
||||||
x.summaryPoint >= 60.0 && x.summaryPoint <= 69.99
|
x.summaryPoint >= 60.0 && x.summaryPoint <= 69.99
|
||||||
? Extension.ToThaiNumber(x.summaryPoint.toString())
|
? Extension.ToThaiNumber(x.summaryPoint.toString())
|
||||||
: "",
|
: "-",
|
||||||
point5:
|
point5:
|
||||||
x.summaryPoint < 60.0 ? Extension.ToThaiNumber(x.summaryPoint.toString()) : "",
|
x.summaryPoint < 60.0
|
||||||
|
? Extension.ToThaiNumber(x.summaryPoint.toString())
|
||||||
|
: "-",
|
||||||
remark: x.reasonEvaluator,
|
remark: x.reasonEvaluator,
|
||||||
}))
|
}))
|
||||||
: [{}];
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
point1: "-",
|
||||||
|
point2: "-",
|
||||||
|
point3: "-",
|
||||||
|
point4: "-",
|
||||||
|
point5: "-",
|
||||||
|
remark: "-",
|
||||||
|
}];
|
||||||
const prefixEvaluator_ =
|
const prefixEvaluator_ =
|
||||||
data.kpiUserEvaluations.length > 0 ? data.kpiUserEvaluations[0].prefixEvaluator : "";
|
data.kpiUserEvaluations.length > 0 ? data.kpiUserEvaluations[0].prefixEvaluator : "";
|
||||||
const firstNameEvaluator_ =
|
const firstNameEvaluator_ =
|
||||||
|
|
@ -408,8 +494,8 @@ export class ReportController extends Controller {
|
||||||
period2: Extension.ToThaiNumber(period2),
|
period2: Extension.ToThaiNumber(period2),
|
||||||
durationKPI: data?.durationKPI,
|
durationKPI: data?.durationKPI,
|
||||||
root:
|
root:
|
||||||
data?.kpiUserEvaluations != null && data?.kpiUserEvaluations.length > 0
|
data && data.rootName != null
|
||||||
? data?.kpiUserEvaluations[0].orgEvaluator
|
? data.rootName
|
||||||
: "-",
|
: "-",
|
||||||
fullNameEvaluator: fullNameEvaluator,
|
fullNameEvaluator: fullNameEvaluator,
|
||||||
positionEvaluator:
|
positionEvaluator:
|
||||||
|
|
@ -827,7 +913,60 @@ export class ReportController extends Controller {
|
||||||
year5: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow).toString()),
|
year5: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow).toString()),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
formattedData = combinedData;
|
formattedData = profileEvaluation.length > 0
|
||||||
|
? combinedData
|
||||||
|
: {
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posType: "-",
|
||||||
|
posLevel: "-",
|
||||||
|
affiliation: "-",
|
||||||
|
summaryPointAPR1: "-",
|
||||||
|
textPointAPR1: "-",
|
||||||
|
periodAPR1: "-",
|
||||||
|
yearAPR1: "-",
|
||||||
|
summaryPointOCT1: "-",
|
||||||
|
textPointOCT1: "-",
|
||||||
|
periodOCT1: "-",
|
||||||
|
yearOCT1: "-",
|
||||||
|
summaryPointAPR2: "-",
|
||||||
|
textPointAPR2: "-",
|
||||||
|
periodAPR2: "-",
|
||||||
|
yearAPR2: "-",
|
||||||
|
summaryPointOCT2: "-",
|
||||||
|
textPointOCT2: "-",
|
||||||
|
periodOCT2: "-",
|
||||||
|
yearOCT2: "-",
|
||||||
|
summaryPointAPR3: "-",
|
||||||
|
textPointAPR3: "-",
|
||||||
|
periodAPR3: "-",
|
||||||
|
yearAPR3: "-",
|
||||||
|
summaryPointOCT3: "-",
|
||||||
|
textPointOCT3: "-",
|
||||||
|
periodOCT3: "-",
|
||||||
|
yearOCT3: "-",
|
||||||
|
summaryPointAPR4: "-",
|
||||||
|
textPointAPR4: "-",
|
||||||
|
periodAPR4: "-",
|
||||||
|
yearAPR4: "-",
|
||||||
|
summaryPointOCT4: "-",
|
||||||
|
textPointOCT4: "-",
|
||||||
|
periodOCT4: "-",
|
||||||
|
yearOCT4: "-",
|
||||||
|
summaryPointAPR5: "-",
|
||||||
|
textPointAPR5: "-",
|
||||||
|
periodAPR5: "-",
|
||||||
|
yearAPR5: "-",
|
||||||
|
summaryPointOCT5: "-",
|
||||||
|
textPointOCT5: "-",
|
||||||
|
periodOCT5: "-",
|
||||||
|
yearOCT5: "-",
|
||||||
|
year1: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow - 4).toString()),
|
||||||
|
year2: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow - 3).toString()),
|
||||||
|
year3: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow - 2).toString()),
|
||||||
|
year4: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow - 1).toString()),
|
||||||
|
year5: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow).toString()),
|
||||||
|
};
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1010,7 +1149,42 @@ export class ReportController extends Controller {
|
||||||
year3: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow).toString()),
|
year3: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow).toString()),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
formattedData = combinedData;
|
formattedData = profileEvaluation.length > 0
|
||||||
|
? combinedData
|
||||||
|
: {
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posType: "-",
|
||||||
|
posLevel: "-",
|
||||||
|
affiliation: "-",
|
||||||
|
summaryPointAPR1: "-",
|
||||||
|
textPointAPR1: "-",
|
||||||
|
periodAPR1: "-",
|
||||||
|
yearAPR1: "-",
|
||||||
|
summaryPointOCT1: "-",
|
||||||
|
textPointOCT1: "-",
|
||||||
|
periodOCT1: "-",
|
||||||
|
yearOCT1: "-",
|
||||||
|
summaryPointAPR2: "-",
|
||||||
|
textPointAPR2: "-",
|
||||||
|
periodAPR2: "-",
|
||||||
|
yearAPR2: "-",
|
||||||
|
summaryPointOCT2: "-",
|
||||||
|
textPointOCT2: "-",
|
||||||
|
periodOCT2: "-",
|
||||||
|
yearOCT2: "-",
|
||||||
|
summaryPointAPR3: "-",
|
||||||
|
textPointAPR3: "-",
|
||||||
|
periodAPR3: "-",
|
||||||
|
yearAPR3: "-",
|
||||||
|
summaryPointOCT3: "-",
|
||||||
|
textPointOCT3: "-",
|
||||||
|
periodOCT3: "-",
|
||||||
|
yearOCT3: "-",
|
||||||
|
year1: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow - 2).toString()),
|
||||||
|
year2: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow - 1).toString()),
|
||||||
|
year3: Extension.ToThaiNumber(Extension.ToThaiYear(yearNow).toString()),
|
||||||
|
};
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1036,24 +1210,33 @@ export class ReportController extends Controller {
|
||||||
// : ""
|
// : ""
|
||||||
return {
|
return {
|
||||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
fullName: x.prefix != null && x.firstName != null && x.lastName != null
|
||||||
position: x.position ? x.position : "",
|
? `${x.prefix}${x.firstName} ${x.lastName}`
|
||||||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
: "-",
|
||||||
developName: x.topicEvaluator ? x.topicEvaluator : "",
|
position: x.position ? x.position : "-",
|
||||||
developEvaluator: x.developEvaluator ? x.developEvaluator : "",
|
posLevelName: x.posLevelName ? x.posLevelName : "-",
|
||||||
// target: target_ ? target_.target : "",
|
developName: x.topicEvaluator ? x.topicEvaluator : "-",
|
||||||
|
developEvaluator: x.developEvaluator ? x.developEvaluator : "-",
|
||||||
target: "-",
|
target: "-",
|
||||||
timeEvaluator: x.timeEvaluator ? Extension.ToThaiNumber(x.timeEvaluator) : "",
|
timeEvaluator: x.timeEvaluator ? Extension.ToThaiNumber(x.timeEvaluator) : "-",
|
||||||
developResults: "-", //วิธีการวัดผลการพัฒนา
|
developResults: "-",
|
||||||
// isDev70,
|
|
||||||
// isDev20,
|
|
||||||
// isDev10,
|
|
||||||
evaluationResults: x.evaluationResults
|
evaluationResults: x.evaluationResults
|
||||||
? Extension.EvaluationResult(x.evaluationResults)
|
? Extension.EvaluationResult(x.evaluationResults)
|
||||||
: "",
|
: "-",
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
: [{}],
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
developName: "-",
|
||||||
|
developEvaluator: "-",
|
||||||
|
target: "-",
|
||||||
|
timeEvaluator: "-",
|
||||||
|
developResults: "-",
|
||||||
|
evaluationResults: "-"
|
||||||
|
}],
|
||||||
);
|
);
|
||||||
formattedData = {
|
formattedData = {
|
||||||
year: data.year ? Extension.ToThaiNumber((data.year + 543).toString()) : "-",
|
year: data.year ? Extension.ToThaiNumber((data.year + 543).toString()) : "-",
|
||||||
|
|
@ -1061,10 +1244,23 @@ export class ReportController extends Controller {
|
||||||
period2: Extension.ToThaiNumber(period2),
|
period2: Extension.ToThaiNumber(period2),
|
||||||
durationKPI: data.durationKPI,
|
durationKPI: data.durationKPI,
|
||||||
root:
|
root:
|
||||||
data.kpiUserEvaluations != null && data.kpiUserEvaluations.length > 0
|
data && data.rootName != null
|
||||||
? data?.kpiUserEvaluations[0].orgEvaluator
|
? data.rootName
|
||||||
: "-",
|
: "-",
|
||||||
userEvaluations: userEvaluations_,
|
userEvaluations: userEvaluations_.length > 0
|
||||||
|
? userEvaluations_
|
||||||
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
developName: "-",
|
||||||
|
developEvaluator: "-",
|
||||||
|
target: "-",
|
||||||
|
timeEvaluator: "-",
|
||||||
|
developResults: "-",
|
||||||
|
evaluationResults: "-"
|
||||||
|
}],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (requestBody.type == "KPI8") {
|
if (requestBody.type == "KPI8") {
|
||||||
|
|
@ -1214,22 +1410,38 @@ export class ReportController extends Controller {
|
||||||
)
|
)
|
||||||
.map((x: any, idx: number) => ({
|
.map((x: any, idx: number) => ({
|
||||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
fullName: x.prefix != null && x.firstName != null && x.lastName != null
|
||||||
position: x.position ? x.position : "",
|
? `${x.prefix}${x.firstName} ${x.lastName}`
|
||||||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
: "-",
|
||||||
|
position: x.position ? x.position : "-",
|
||||||
|
posLevelName: x.posLevelName ? x.posLevelName : "-",
|
||||||
evaluationResults: x.evaluationResults
|
evaluationResults: x.evaluationResults
|
||||||
? Extension.EvaluationResult(x.evaluationResults)
|
? Extension.EvaluationResult(x.evaluationResults)
|
||||||
: "",
|
: "-",
|
||||||
}))
|
}))
|
||||||
: [{}];
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
evaluationResults: "-",
|
||||||
|
}];
|
||||||
formattedData = {
|
formattedData = {
|
||||||
root:
|
root:
|
||||||
data?.kpiUserEvaluations != null && data?.kpiUserEvaluations.length > 0
|
data && data.rootName != null
|
||||||
? data?.kpiUserEvaluations[0].orgEvaluator
|
? data.rootName
|
||||||
: "-",
|
: "-",
|
||||||
period: data?.durationKPI == "APR" ? "๑" : data?.durationKPI == "OCT" ? "๒" : "-",
|
period: data?.durationKPI == "APR" ? "๑" : data?.durationKPI == "OCT" ? "๒" : "-",
|
||||||
year: data.year ? Extension.ToThaiNumber((data.year + 543).toString()) : "-",
|
year: data.year ? Extension.ToThaiNumber((data.year + 543).toString()) : "-",
|
||||||
userEvaluations: userEvaluations_.length > 0 ? userEvaluations_ : [{}],
|
userEvaluations: userEvaluations_.length > 0
|
||||||
|
? userEvaluations_
|
||||||
|
: [{
|
||||||
|
no: "-",
|
||||||
|
fullName: "-",
|
||||||
|
position: "-",
|
||||||
|
posLevelName: "-",
|
||||||
|
evaluationResults: "-",
|
||||||
|
}],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue