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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-07-08 17:46:32 +07:00
parent b59bcc9163
commit 5c6abbe412
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/ReportController.ts
View file

@ -2302,7 +2302,7 @@ export class ReportController extends Controller {
}, },
relations: ["salaryProfiles"], relations: ["salaryProfiles"],
}); });
const salaryProfileSpecial = await this.salaryProfileRepository.find({ const salaryProfileSpecial = await this.salaryProfileRepository.find({
relations: ["salaryOrg"], relations: ["salaryOrg"],
where: { where: {
@ -2322,6 +2322,7 @@ export class ReportController extends Controller {
"posMasterNo", "posMasterNo",
"amount", "amount",
"amountSpecial", "amountSpecial",
"remark",
], ],
order: { order: {
salaryOrg: { salaryOrg: {

3
src/entities/SalaryProfile.ts
View file

@ -436,4 +436,7 @@ export class CreateSalaryProfile {
@Column() @Column()
isSpecial: boolean; isSpecial: boolean;
@Column()
remark: string | null;
} }