From a347b35384c7f5fbaffdb32f61d4833627f7be30 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Wed, 13 Nov 2024 16:40:17 +0800 Subject: [PATCH] update --- .../com/ffii/tsms/modules/report/service/ReportService.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 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 df272c6..737a5df 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 @@ -3708,10 +3708,11 @@ open class ReportService( it.staff.id == ts.staff!!.id && it.startDate <= ts.recordDate && (it.endDate >= ts.recordDate || it.endDate == null) } + val hourlyRate = (thisSE?.salary?.hourlyRate ?: ts.staff!!.salary.hourlyRate).toDouble() val normalHour = ts.normalConsumed ?: 0.0 val otHour = ts.otConsumed ?: 0.0 - val normalCost = normalHour.times(thisSE!!.salary.hourlyRate.toDouble()) - val otCost = otHour.times(thisSE.salary.hourlyRate.toDouble()).times(otMultiplier) + val normalCost = normalHour.times(hourlyRate) + val otCost = otHour.times(hourlyRate).times(otMultiplier) //assigning data val projectTeam = ts.project!!.teamLead!!.team.code val staffTeam = ts.staff!!.team.code