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

เงินเดือนออกคำสั่ง

Browse source
This commit is contained in:
kittapath 2024-12-26 20:58:53 +07:00
parent ab9c8a34eb
commit 345d2fbbee
1 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/controllers/CommandController.ts
View file

@ -1717,40 +1717,41 @@ export class CommandController extends Controller {
commandRecive.order = order;
let salaryData = null_;
const excludedCommands = ["C-PM-33", "C-PM-34", "C-PM-35", "C-PM-36", "C-PM-37"];
if (!excludedCommands.includes(commandCode)) {
if (item.profileId) {
salaryData = await this.profileRepository.findOne({
// const excludedCommands = ["C-PM-33", "C-PM-34", "C-PM-35", "C-PM-36", "C-PM-37"];
// if (!excludedCommands.includes(commandCode)) {
if (item.profileId) {
salaryData = await this.profileRepository.findOne({
where: {
id: item.profileId,
},
});
let null_: any = 0;
if (!salaryData) {
salaryData = await this.profileEmployeeRepository.findOne({
where: {
id: item.profileId,
},
});
let null_: any = 0;
if (!salaryData) {
salaryData = await this.profileEmployeeRepository.findOne({
where: {
id: item.profileId,
},
});
}
commandRecive.amount = salaryData ? salaryData.amount : null_;
commandRecive.amountSpecial = salaryData ? salaryData.amountSpecial : null_;
commandRecive.positionSalaryAmount = salaryData
? salaryData.positionSalaryAmount
: null_;
commandRecive.mouthSalaryAmount = salaryData ? salaryData.mouthSalaryAmount : null_;
} else {
commandRecive.amount = null_;
commandRecive.amountSpecial = null_;
commandRecive.positionSalaryAmount = null_;
commandRecive.mouthSalaryAmount = null_;
}
commandRecive.amount = item.amount ?? (salaryData ? salaryData.amount : null_);
commandRecive.amountSpecial =
item.amountSpecial ?? (salaryData ? salaryData.amountSpecial : null_);
commandRecive.positionSalaryAmount =
item.positionSalaryAmount ?? (salaryData ? salaryData.positionSalaryAmount : null_);
commandRecive.mouthSalaryAmount =
item.mouthSalaryAmount ?? (salaryData ? salaryData.mouthSalaryAmount : null_);
} else {
commandRecive.amount = item.amount ?? null_;
commandRecive.amountSpecial = item.amountSpecial ?? null_;
commandRecive.positionSalaryAmount = item.positionSalaryAmount ?? null_;
commandRecive.mouthSalaryAmount = item.mouthSalaryAmount ?? null_;
commandRecive.amount = null_;
commandRecive.amountSpecial = null_;
commandRecive.positionSalaryAmount = null_;
commandRecive.mouthSalaryAmount = null_;
}
// } else {
// commandRecive.amount = item.amount ?? null_;
// commandRecive.amountSpecial = item.amountSpecial ?? null_;
// commandRecive.positionSalaryAmount = item.positionSalaryAmount ?? null_;
// commandRecive.mouthSalaryAmount = item.mouthSalaryAmount ?? null_;
// }
commandRecive.remarkVertical =
item.remarkVertical == null ? null_ : item.remarkVertical;