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

no message

Browse source
This commit is contained in:
Bright 2024-04-05 15:01:48 +07:00
parent d29e06384c
commit c9c79a52be
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/ReportController.ts
View file

@ -2008,9 +2008,6 @@ export class ReportController extends Controller {
snapshot: "SNAP2",
group: "GROUP1"
},
order: {
group: "ASC",
},
relations: ["salaryProfiles"],
});
const salaryOrgGroup2 = await this.salaryOrgRepository.findOne({
@ -2020,13 +2017,11 @@ export class ReportController extends Controller {
snapshot: "SNAP2",
group: "GROUP2"
},
order: {
group: "ASC",
},
relations: ["salaryProfiles"],
});
const salaryProfileSpecial = await this.salaryProfileRepository.find({
relations: ["salaryOrg"],
where: {
salaryOrgId: In([salaryOrgGroup1?.id, salaryOrgGroup2?.id,]),
amountSpecial: MoreThan(1),
@ -2046,11 +2041,15 @@ export class ReportController extends Controller {
"amountSpecial",
],
order: {
salaryOrg: {
group: "ASC"
},
posMasterNo: "ASC",
},
});
const salaryProfileNoAmount = await this.salaryProfileRepository.find({
relations: ["salaryOrg"],
where: {
salaryOrgId: In([salaryOrgGroup1?.id, salaryOrgGroup2?.id,]),
// amountUse: IsNull() || 0,
@ -2071,6 +2070,9 @@ export class ReportController extends Controller {
"amount",
],
order: {
salaryOrg: {
group: "ASC"
},
posMasterNo: "ASC",
},
});
@ -2105,7 +2107,7 @@ export class ReportController extends Controller {
amount:
item.amount == undefined || item.amount == null
? "๐"
: Extension.ToThaiNumber(String(item.amount)),
: Extension.ToThaiNumber(String(item.amount.toLocaleString())),
remark: null,
}));