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

Merge branch 'develop'

Browse source
This commit is contained in:
moss 2025-04-09 15:34:20 +07:00
commit e60ba06cab
2 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/EvaluationController.ts
View file

@ -2533,7 +2533,6 @@ export class EvaluationController {
const evaluation = await this.evaluationRepository.findOne({ const evaluation = await this.evaluationRepository.findOne({
where: { id }, where: { id },
select: [ select: [
"id",
"author", "author",
"subject", "subject",
"commanderFullname", "commanderFullname",
@ -2570,7 +2569,6 @@ export class EvaluationController {
const evaluation = await this.evaluationRepository.findOne({ const evaluation = await this.evaluationRepository.findOne({
where: { id }, where: { id },
select: [ select: [
"id",
"author", "author",
"subject", "subject",
"commanderFullname", "commanderFullname",

44
src/controllers/ReportController.ts
View file

@ -207,6 +207,7 @@ export class ReoportController {
"certificate.issueDate", "certificate.issueDate",
"certificate.expireDate", "certificate.expireDate",
"salaries.date", "salaries.date",
"salaries.amount", "salaries.amount",
"salaries.positionSalaryAmount", "salaries.positionSalaryAmount",
@ -218,6 +219,33 @@ export class ReoportController {
"salaries.refCommandNo", "salaries.refCommandNo",
"salaries.refCommandDate", "salaries.refCommandDate",
"salaries.salaryStatus", "salaries.salaryStatus",
"salaries.profileId",
"salaries.commandCode",
"salaries.commandNo",
"salaries.commandYear",
"salaries.commandDateAffect",
"salaries.commandDateSign",
"salaries.posNoAbb",
"salaries.positionName",
"salaries.positionType",
"salaries.positionLevel",
"salaries.positionLine",
"salaries.positionPathSide",
"salaries.positionExecutive",
"salaries.amountSpecial",
"salaries.orgRoot",
"salaries.orgChild1",
"salaries.orgChild2",
"salaries.orgChild3",
"salaries.orgChild4",
"salaries.remark",
"salaries.commandId",
"salaries.isGovernment",
"salaries.positionCee",
"salaries.commandName",
"salaries.posNumCodeSit",
"salaries.posNumCodeSitAbb",
"salaries.isEntry",
"training.name", "training.name",
"training.topic", "training.topic",
@ -238,6 +266,7 @@ export class ReoportController {
"assessment.pointSumTotal", "assessment.pointSumTotal",
"assessment.pointSum", "assessment.pointSum",
]) ])
.orderBy("salaries.commandDateAffect", "DESC")
.getOne(); .getOne();
if (!evaluation) { if (!evaluation) {
@ -343,10 +372,10 @@ export class ReoportController {
? `(${Extension.ToThaiNumber( ? `(${Extension.ToThaiNumber(
Extension.ToThaiShortDate(education.finishDate).toString(), Extension.ToThaiShortDate(education.finishDate).toString(),
)})` )})`
: "-", : "",
isEducation: education.isEducation, isEducation: education.isEducation,
degree: education.degree ? Extension.ToThaiNumber(education.degree) : "-", degree: education.degree ? Extension.ToThaiNumber(education.degree) : "-",
field: education.field ? `(${Extension.ToThaiNumber(education.field)})` : "-", field: education.field ? `(${Extension.ToThaiNumber(education.field)})` : "",
fundName: education.fundName, fundName: education.fundName,
gpa: education.gpa, gpa: education.gpa,
country: education.country, country: education.country,
@ -389,13 +418,13 @@ export class ReoportController {
salaries: salaries:
evaluation.salaries.length > 0 evaluation.salaries.length > 0
? evaluation.salaries.map((salaries) => ({ ? evaluation.salaries.map((salaries) => ({
date: salaries.date date: salaries.commandDateAffect
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(salaries.date)) ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(salaries.commandDateAffect))
: "-", : "-",
amount: salaries.amount amount: salaries.amount
? Extension.ToThaiNumber(salaries.amount.toLocaleString()) ? Extension.ToThaiNumber(salaries.amount.toLocaleString())
: "-", : "-",
position: salaries.position ? Extension.ToThaiNumber(salaries.position) : "-", position: salaries.positionName ? Extension.ToThaiNumber(salaries.positionName) : "-",
positionSalaryAmount: salaries.positionSalaryAmount, positionSalaryAmount: salaries.positionSalaryAmount,
mouthSalaryAmount: salaries.mouthSalaryAmount, mouthSalaryAmount: salaries.mouthSalaryAmount,
posNo: salaries.posNo, posNo: salaries.posNo,
@ -404,6 +433,11 @@ export class ReoportController {
refCommandNo: salaries.refCommandNo, refCommandNo: salaries.refCommandNo,
refCommandDate: salaries.refCommandDate, refCommandDate: salaries.refCommandDate,
salaryStatus: salaries.salaryStatus, salaryStatus: salaries.salaryStatus,
org: (salaries.orgChild4 ? salaries.orgChild4 + "\n" : "") +
(salaries.orgChild3 ? salaries.orgChild3 + "\n" : "") +
(salaries.orgChild2 ? salaries.orgChild2 + "\n" : "") +
(salaries.orgChild1 ? salaries.orgChild1 + "\n" : "") +
(salaries.orgRoot ? salaries.orgRoot : ""),
})) }))
: [ : [
{ {