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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m2s
Details

Browse source
This commit is contained in:
harid 2026-03-06 10:24:09 +07:00
commit db5028656d
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/DevelopmentController.ts
View file

@ -2580,6 +2580,7 @@ export class DevelopmentController extends Controller {
where: { developmentId: id }, where: { developmentId: id },
relations: ["posLevel", "posType", "employeePosLevel", "employeePosType"], relations: ["posLevel", "posType", "employeePosLevel", "employeePosType"],
order: { order: {
no: "ASC",
isDone: "ASC", isDone: "ASC",
isDoneIDP: "ASC", isDoneIDP: "ASC",
citizenId: "ASC", citizenId: "ASC",
@ -2587,6 +2588,7 @@ export class DevelopmentController extends Controller {
}, },
}); });
const _getDevelopment = getDevelopment.map((item) => ({ const _getDevelopment = getDevelopment.map((item) => ({
no: item.no,
id: item.id, id: item.id,
type: item.type, type: item.type,
idcard: item.citizenId, idcard: item.citizenId,

4
src/controllers/DevelopmentScholarshipController.ts
View file

@ -330,7 +330,7 @@ export class DevelopmentScholarshipController extends Controller {
id: item.id, id: item.id,
year: item.scholarshipYear, year: item.scholarshipYear,
citizenId: item.citizenId, citizenId: item.citizenId,
fullName: `${item.prefix ?? ""}${item.firstName ?? ""} ${item.lastName ?? ""}`, fullName: `${item.prefix ?? ""}${item.firstName ?? ""} ${item.lastName ?? ""}`.trim(),
position: item.position, position: item.position,
posType: item.posType ? item.posType.posTypeName : null, posType: item.posType ? item.posType.posTypeName : null,
posLevel: item.posLevel ? item.posLevel.posLevelName : null, posLevel: item.posLevel ? item.posLevel.posLevelName : null,
@ -339,7 +339,7 @@ export class DevelopmentScholarshipController extends Controller {
scholarshipType: item.scholarshipType, scholarshipType: item.scholarshipType,
startDate: item.startDate, startDate: item.startDate,
endDate: item.endDate, endDate: item.endDate,
fullNameGuarantor: `${item.guarantorPrefix ?? ""}${item.guarantorFirstName ?? ""} ${item.guarantorLastName ?? ""}` , fullNameGuarantor: `${item.guarantorPrefix ?? ""}${item.guarantorFirstName ?? ""} ${item.guarantorLastName ?? ""}`.trim(),
guarantorCitizenId: item.guarantorCitizenId, guarantorCitizenId: item.guarantorCitizenId,
})); }));