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

Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 10s
Details

Browse source
This commit is contained in:
harid 2025-12-24 17:48:52 +07:00
commit d8420d48b1
2 changed files with 56 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/controllers/OrganizationDotnetController.ts
View file

@ -2657,12 +2657,17 @@ export class OrganizationDotnetController extends Controller {
dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate, dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
posLevel: profile.posLevel?.posLevelName ?? "", posLevel: profile.posLevel?.posLevelName ?? "",
posType: profile.posType?.posTypeName ?? "", posType: profile.posType?.posTypeName ?? "",
profileSalary: profile.profileSalary, // profileSalary: profile.profileSalary,
profileSalary: profile.profileSalary?.map((x) => ({
...x,
date: x.commandDateAffect ?? new Date()
})) ?? [],
// profileInsignia: profile.profileInsignias.map((x) => { // profileInsignia: profile.profileInsignias.map((x) => {
// return { ...x, insignia: x.insignia.name }; // return { ...x, insignia: x.insignia.name };
// }), // }),
profileInsignia: profile.profileInsignias?.map((x) => ({ profileInsignia: profile.profileInsignias?.map((x) => ({
...x, ...x,
insigniaId: x.insignia?.id ?? null,
insignia: x.insignia?.name ?? null, insignia: x.insignia?.name ?? null,
})) ?? [], })) ?? [],
amount: profile.amount, amount: profile.amount,
@ -2962,9 +2967,14 @@ export class OrganizationDotnetController extends Controller {
: profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""), : profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
posType: profile.posType?.posTypeName ?? "", posType: profile.posType?.posTypeName ?? "",
profileSalary: profile.profileSalary, profileSalary: profile.profileSalary,
profileInsignia: profile.profileInsignias.map((x) => { // profileInsignia: profile.profileInsignias.map((x) => {
return { ...x, insignia: x.insignia.name }; // return { ...x, insignia: x.insignia.name };
}), // }),
profileInsignia: profile.profileInsignias?.map((x) => ({
...x,
insigniaId: x.insignia?.id ?? null,
insignia: x.insignia?.name ?? null,
})) ?? [],
amount: profile.amount, amount: profile.amount,
positionSalaryAmount: profile.positionSalaryAmount, positionSalaryAmount: profile.positionSalaryAmount,
mouthSalaryAmount: profile.mouthSalaryAmount, mouthSalaryAmount: profile.mouthSalaryAmount,
@ -3176,12 +3186,21 @@ export class OrganizationDotnetController extends Controller {
? "" ? ""
: profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""), : profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
posType: profile.posType?.posTypeName ?? "", posType: profile.posType?.posTypeName ?? "",
profileSalary: profile.profileSalary.map((x) => { // profileSalary: profile.profileSalary.map((x) => {
return { ...x, date: x.commandDateAffect ?? new Date() }; // return { ...x, date: x.commandDateAffect ?? new Date() };
}), // }),
profileInsignia: profile.profileInsignias.map((x) => { profileSalary: profile.profileSalary?.map((x) => ({
return { ...x, insignia: x.insignia.name }; ...x,
}), date: x.commandDateAffect ?? new Date()
})) ?? [],
// profileInsignia: profile.profileInsignias.map((x) => {
// return { ...x, insignia: x.insignia.name };
// }),
profileInsignia: profile.profileInsignias?.map((x) => ({
...x,
insigniaId: x.insignia?.id ?? null,
insignia: x.insignia?.name ?? null,
})) ?? [],
amount: profile.amount, amount: profile.amount,
positionSalaryAmount: profile.positionSalaryAmount, positionSalaryAmount: profile.positionSalaryAmount,
mouthSalaryAmount: profile.mouthSalaryAmount, mouthSalaryAmount: profile.mouthSalaryAmount,

35
src/controllers/OrganizationUnauthorizeController.ts
View file

@ -1663,12 +1663,17 @@ export class OrganizationUnauthorizeController extends Controller {
dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate, dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
posLevel: profile.posLevel?.posLevelName ?? "", posLevel: profile.posLevel?.posLevelName ?? "",
posType: profile.posType?.posTypeName ?? "", posType: profile.posType?.posTypeName ?? "",
profileSalary: profile.profileSalary, // profileSalary: profile.profileSalary,
profileSalary: profile.profileSalary?.map((x) => ({
...x,
date: x.commandDateAffect ?? new Date()
})) ?? [],
// profileInsignia: profile.profileInsignias.map((x) => { // profileInsignia: profile.profileInsignias.map((x) => {
// return { ...x, insignia: x.insignia.name }; // return { ...x, insignia: x.insignia.name };
// }), // }),
profileInsignia: profile.profileInsignias?.map((x) => ({ profileInsignia: profile.profileInsignias?.map((x) => ({
...x, ...x,
insigniaId: x.insignia?.id ?? null,
insignia: x.insignia?.name ?? null, insignia: x.insignia?.name ?? null,
})) ?? [], })) ?? [],
amount: profile.amount, amount: profile.amount,
@ -1879,7 +1884,12 @@ export class OrganizationUnauthorizeController extends Controller {
posLevel: profile.posLevel ? profile.posLevel : null, posLevel: profile.posLevel ? profile.posLevel : null,
posType: profile.posType ? profile.posType : null, posType: profile.posType ? profile.posType : null,
profileSalary: profile.profileSalary, profileSalary: profile.profileSalary,
profileInsignia: profile.profileInsignias, // profileInsignia: profile.profileInsignias,
profileInsignia: profile.profileInsignias?.map((x) => ({
...x,
insigniaId: x.insignia?.id ?? null,
insignia: x.insignia?.name ?? null,
})) ?? [],
})); }));
return new HttpSuccess(mapProfile); return new HttpSuccess(mapProfile);
@ -2053,12 +2063,21 @@ export class OrganizationUnauthorizeController extends Controller {
? "" ? ""
: profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""), : profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
posType: profile.posType?.posTypeName ?? "", posType: profile.posType?.posTypeName ?? "",
profileSalary: profile.profileSalary.map((x) => { // profileSalary: profile.profileSalary.map((x) => {
return { ...x, date: x.commandDateAffect ?? new Date() }; // return { ...x, date: x.commandDateAffect ?? new Date() };
}), // }),
profileInsignia: profile.profileInsignias.map((x) => { profileSalary: profile.profileSalary?.map((x) => ({
return { ...x, insignia: x.insignia.name }; ...x,
}), date: x.commandDateAffect ?? new Date()
})) ?? [],
// profileInsignia: profile.profileInsignias.map((x) => {
// return { ...x, insignia: x.insignia.name };
// }),
profileInsignia: profile.profileInsignias?.map((x) => ({
...x,
insigniaId: x.insignia?.id ?? null,
insignia: x.insignia?.name ?? null,
})) ?? [],
amount: profile.amount, amount: profile.amount,
positionSalaryAmount: profile.positionSalaryAmount, positionSalaryAmount: profile.positionSalaryAmount,
mouthSalaryAmount: profile.mouthSalaryAmount, mouthSalaryAmount: profile.mouthSalaryAmount,