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

fixed
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m10s
Details

Browse source
This commit is contained in:
Warunee Tamkoo 2026-04-28 17:12:54 +07:00
parent 190a5d665a
commit 5caa7db75a
4 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/controllers/ImportDataController.ts
View file

@ -7052,16 +7052,16 @@ export class ImportDataController extends Controller {
salaryTemp.lastUpdateUserId = req.user?.sub || "";
salaryTemp.lastUpdateFullName = req.user?.name || "System Administrator";
// 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
salaryTemp.isGovernment = false;
salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
salaryTemp.isGovernment = true;
salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
}
// // 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
// if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
// salaryTemp.isGovernment = false;
// salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
// }
// // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
// else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
// salaryTemp.isGovernment = true;
// salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
// }
salaryTemps.push(salaryTemp);
}
@ -7312,16 +7312,16 @@ export class ImportDataController extends Controller {
salaryTemp.lastUpdateUserId = req.user?.sub || "";
salaryTemp.lastUpdateFullName = req.user?.name || "System Administrator";
// 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
salaryTemp.isGovernment = false;
salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
salaryTemp.isGovernment = true;
salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
}
// // 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
// if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
// salaryTemp.isGovernment = false;
// salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
// }
// // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
// else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
// salaryTemp.isGovernment = true;
// salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
// }
salaryTemps.push(salaryTemp);
}

40
src/controllers/ProfileSalaryController.ts
View file

@ -919,16 +919,16 @@ export class ProfileSalaryController extends Controller {
else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
}
Object.assign(data, { ...body, ...meta });
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
data.isGovernment = false;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
data.isGovernment = true;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
// // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
// if (["12", "15", "16"].includes(body.commandCode ?? "")) {
// data.isGovernment = false;
// if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
// }
// // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
// else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
// data.isGovernment = true;
// if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
// }
const history = new ProfileSalaryHistory();
Object.assign(history, { ...data, id: undefined });
@ -1054,16 +1054,16 @@ export class ProfileSalaryController extends Controller {
else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
}
Object.assign(record, body);
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
record.isGovernment = false;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
record.isGovernment = true;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
}
// // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
// if (["12", "15", "16"].includes(body.commandCode ?? "")) {
// record.isGovernment = false;
// if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
// }
// // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
// else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
// record.isGovernment = true;
// if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
// }
Object.assign(history, { ...record, id: undefined });

40
src/controllers/ProfileSalaryEmployeeController.ts
View file

@ -403,16 +403,16 @@ export class ProfileSalaryEmployeeController extends Controller {
else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
}
Object.assign(data, { ...body, ...meta });
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
data.isGovernment = false;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
data.isGovernment = true;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
// // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
// if (["12", "15", "16"].includes(body.commandCode ?? "")) {
// data.isGovernment = false;
// if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
// }
// // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
// else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
// data.isGovernment = true;
// if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
// }
const history = new ProfileSalaryHistory();
Object.assign(history, { ...data, id: undefined });
@ -548,16 +548,16 @@ export class ProfileSalaryEmployeeController extends Controller {
else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
}
Object.assign(record, body);
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
record.isGovernment = false;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
record.isGovernment = true;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
}
// // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
// if (["12", "15", "16"].includes(body.commandCode ?? "")) {
// record.isGovernment = false;
// if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
// }
// // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
// else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
// record.isGovernment = true;
// if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
// }
Object.assign(history, { ...record, id: undefined });
history.profileSalaryId = salaryId;

34
src/controllers/ProfileSalaryTempController.ts
View file

@ -1233,13 +1233,13 @@ export class ProfileSalaryTempController extends Controller {
isDelete: false,
};
Object.assign(data, { ...body, ...meta });
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
data.isGovernment = false;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
} else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
data.isGovernment = true;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
// if (["12", "15", "16"].includes(body.commandCode ?? "")) {
// data.isGovernment = false;
// if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
// } else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
// data.isGovernment = true;
// if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
// }
await this.salaryRepo.save(data, { data: req });
setLogDataDiff(req, { before, after: data });
@ -1516,16 +1516,16 @@ export class ProfileSalaryTempController extends Controller {
const before = structuredClone(record);
Object.assign(record, body);
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
record.isGovernment = false;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
record.isGovernment = true;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
}
// // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
// if (["12", "15", "16"].includes(body.commandCode ?? "")) {
// record.isGovernment = false;
// if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
// }
// // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
// else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
// record.isGovernment = true;
// if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
// }
record.isEdit = true;
record.lastUpdateUserId = req.user.sub;