From 89869a288092ebe5dbc8fe14f95ed5869d7ccb92 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Thu, 12 Dec 2024 11:38:24 +0800 Subject: [PATCH] add crossTeam multiplier --- .../com/ffii/tsms/modules/report/service/ReportService.kt | 4 ++-- 1 file changed, 2 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 95432ae..aa9fc1c 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 @@ -3887,12 +3887,12 @@ open class ReportService( } println(_grade) val gradeCode = _grade!!.grade.code -// val otMultiplier = 1.15 + val crossTeamMultiplier = 1.15 val thisSE = salaryEffective.find { 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 hourlyRate = (thisSE?.salary?.hourlyRate ?: ts.staff!!.salary.hourlyRate).toDouble().times(crossTeamMultiplier) val normalHour = ts.normalConsumed ?: 0.0 val otHour = ts.otConsumed ?: 0.0 val normalCost = normalHour.times(hourlyRate)