diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 6d1a702..447aa6c 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -84,13 +84,20 @@ export class ReportController extends Controller { const mapSalaryRank = salaryRank.map((item, index) => ({ // no: index + 1, // id: item.id, - salary: item.salary == null || 0 ? "" : item.salary.toLocaleString() , - salaryHalf: item.salaryHalf == null || 0 ? "" : item.salaryHalf.toLocaleString(), - salaryHalfSpecial: item.salaryHalfSpecial == null || 0 ? "" : item.salaryHalfSpecial.toLocaleString(), - salaryFull: item.salaryFull == null || 0 ? "" : item.salaryFull.toLocaleString(), - salaryFullSpecial: item.salaryFullSpecial == null || 0 ? "" : item.salaryFullSpecial.toLocaleString(), - salaryFullHalf: item.salaryFullHalf == null || 0 ? "" : item.salaryFullHalf.toLocaleString(), - salaryFullHalfSpecial: item.salaryFullHalfSpecial == null || 0 ? "" : item.salaryFullHalfSpecial.toLocaleString(), + 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()+"}*", + salaryFull: item.salaryFull == null || item.salaryFull == 0 ? "" : + item.salaryFull.toLocaleString(), + salaryFullSpecial: 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()+"}*", })); return new HttpSuccess({ template: "salaryReport", reportName: "salaryReport",