update

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<FinancialYear>).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()
                 )
             }