From 532b88b1a736e89a9437f168c3908dd7067984bc Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Fri, 26 Jul 2024 15:32:09 +0800 Subject: [PATCH] update --- .../ffii/tsms/modules/report/service/ReportService.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt index b492d98..242ce9e 100644 --- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt +++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt @@ -2306,7 +2306,7 @@ open class ReportService( "team" to "${item.getValue("teamCode")} - ${item.getValue("teamName")}", "grade" to item.getValue("gradeCode"), "salaryPoint" to item.getValue("salaryPoint"), - "hourlyRate" to hourlyRate, + "hourlyRate" to item.getValue("hourlyRate"), "financialYears" to financialYears, "hourlySpent" to mutableListOf( mapOf( @@ -2366,22 +2366,24 @@ open class ReportService( val staffSalaryData = staffSalaryLists.find { it.staffId == staffId } // println("----------------------- $staffId ---------------------------") // println(staff) +// println(staffSalaryData) val financialYears = (staff["financialYears"] as List).map { year -> - val relevantSalaryData = staffSalaryData?.salaryData?.lastOrNull { + val relevantSalaryData = staffSalaryData?.salaryData?.firstOrNull() { year.isYearMonthInFinancialYear(YearMonth.from(it.financialYear)) } // println("it.financialYear: ${relevantSalaryData?.financialYear}") // println("year: ${year.start}- ${year.end}") // println("it.salaryPoint: ${relevantSalaryData?.salaryPoint}") +// println("it.hourlyRate: ${relevantSalaryData?.hourlyRate?.toDouble()}") // println("it.staffId: ${relevantSalaryData?.staffId}") // Create a new FinancialYear object with the updated salaryPoint year.copy( start = year.start, end = year.end, - salaryPoint = relevantSalaryData?.salaryPoint ?: staff["salaryPoint"] as Int, - hourlyRate = relevantSalaryData?.hourlyRate?.toDouble() ?: staff["hourlyRate"] as Double + salaryPoint = relevantSalaryData?.salaryPoint ?: (staff["salaryPoint"] as Long).toInt(), + hourlyRate = relevantSalaryData?.hourlyRate?.toDouble() ?: (staff["hourlyRate"] as BigDecimal).toDouble() ) }