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

ปรับ report

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-24 17:41:48 +07:00
parent eb7eddabf6
commit a5e58d4552
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/EvaluationController.ts
View file

@ -508,9 +508,10 @@ export class EvaluationController {
if (!evaluation) { if (!evaluation) {
return `not found data`; return `not found data`;
} }
let _code = requestBody.type == "EXPERT" ? "ST05-1" : requestBody.type == "EXPERTISE" ? "ST05-1" : requestBody.type == "SPECIAL_EXPERT" ? "ST05-2" : "ST05-1";
const announceTemplate5 = await this.announceTemplateRepository.findOne({ const announceTemplate5 = await this.announceTemplateRepository.findOne({
where:{ where:{
code : "ST05-1" code : _code
}, },
select: ["detailBody","detailFooter"] select: ["detailBody","detailFooter"]
}) })

4
src/controllers/ReportController.ts
View file

@ -319,6 +319,8 @@ export class ReoportController {
currentYear: Extension.ToThaiNumber(thaiYear.toString()), currentYear: Extension.ToThaiNumber(thaiYear.toString()),
}; };
let _orgNoNewLine = (org ? org : "-").replace(/\n/g, " "); let _orgNoNewLine = (org ? org : "-").replace(/\n/g, " ");
let topic10 = evaluation.type == "EXPERT" || evaluation.type == "EXPERTISE" ? "หน่วยงาน" : evaluation.type == "SPECIAL_EXPERT" ? "กรุงเทพมหานคร" : "หน่วยงาน";
let footer10 = evaluation.type == "EXPERT" || evaluation.type == "EXPERTISE" ? "หัวหน้าหน่วยงาน" : evaluation.type == "SPECIAL_EXPERT" ? "ปลัดกรุงเทพมหานคร" : "หัวหน้าหน่วยงาน";
let typeTh = evaluation.type == "EXPERT" ? "ชำนาญการ" : evaluation.type == "EXPERTISE" ? "เชียวชาญ" : evaluation.type == "SPECIAL_EXPERT" ? "ชำนาญการพิเศษ":""; let typeTh = evaluation.type == "EXPERT" ? "ชำนาญการ" : evaluation.type == "EXPERTISE" ? "เชียวชาญ" : evaluation.type == "SPECIAL_EXPERT" ? "ชำนาญการพิเศษ":"";
const dataEvaluation = { const dataEvaluation = {
isEducationalQft: evaluation.isEducationalQft, isEducationalQft: evaluation.isEducationalQft,
@ -349,6 +351,8 @@ export class ReoportController {
positionAreaWithSym: evaluation.positionArea?`(${Extension.ToThaiNumber(evaluation.positionArea)})` : "", positionAreaWithSym: evaluation.positionArea?`(${Extension.ToThaiNumber(evaluation.positionArea)})` : "",
posExecutive: evaluation.posExecutive, posExecutive: evaluation.posExecutive,
posFull: (evaluation.position ? `${evaluation.position}` : "") + (evaluation.positionLevel ? `${evaluation.positionLevel}` : "") + (evaluation.posExecutive ? " " + `${evaluation.posExecutive}` : "") , posFull: (evaluation.position ? `${evaluation.position}` : "") + (evaluation.positionLevel ? `${evaluation.positionLevel}` : "") + (evaluation.posExecutive ? " " + `${evaluation.posExecutive}` : "") ,
topic10: topic10,
footer10: footer10,
birthDate: birthDate:
evaluation.birthDate != null && evaluation.birthDate != "" evaluation.birthDate != null && evaluation.birthDate != ""
? Extension.ToThaiNumber( ? Extension.ToThaiNumber(