diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index ce29f52..b9f7cf0 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -87,17 +87,17 @@ export class ReportController extends Controller { salary: item.salary == null || item.salary == 0 ? "" : item.salary.toLocaleString(), salaryHalf: item.salaryHalf == null || item.salaryHalf == 0 ? "" : - item.salaryHalf.toLocaleString(), - salaryHalfSpecial: item.salaryHalfSpecial == null || item.salaryHalfSpecial == 0 ? "" : - " ({"+item.salaryHalfSpecial.toLocaleString()+"}*", + item.salaryHalf.toLocaleString() + + (item.salaryHalfSpecial == null || item.salaryHalfSpecial == 0 ? "" : + " ("+item.salaryHalfSpecial.toLocaleString()+"*)"), salaryFull: item.salaryFull == null || item.salaryFull == 0 ? "" : - item.salaryFull.toLocaleString(), - salaryFullSpecial: item.salaryFullSpecial == null || item.salaryFullSpecial == 0 ? "" : - " ({"+item.salaryFullSpecial.toLocaleString()+"}*", + item.salaryFull.toLocaleString() + + (item.salaryFullSpecial == null || item.salaryFullSpecial == 0 ? "" : + " ("+item.salaryFullSpecial.toLocaleString()+"*)"), salaryFullHalf: item.salaryFullHalf == null || item.salaryFullHalf == 0 ? "" : - item.salaryFullHalf.toLocaleString(), - salaryFullHalfSpecial: item.salaryFullHalfSpecial == null || item.salaryFullHalfSpecial == 0 ? "" : - " ({"+item.salaryFullHalfSpecial.toLocaleString()+"}*", + item.salaryFullHalf.toLocaleString() + + (item.salaryFullHalfSpecial == null || item.salaryFullHalfSpecial == 0 ? "" : + " ("+item.salaryFullHalfSpecial.toLocaleString()+"*)"), })); return new HttpSuccess({ template: "SalaryRank", reportName: "SalaryRank",