From d68c8fd4565de6d3b07884fa17a42f6d95feb49c Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Mon, 16 Dec 2024 17:11:23 +0800 Subject: [PATCH] update --- .../com/ffii/tsms/modules/report/service/ReportService.kt | 6 ++---- 1 file changed, 2 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 a49278a..0059f45 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 @@ -3895,11 +3895,10 @@ 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().times(crossTeamMultiplier) + 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(hourlyRate) -// val otCost = otHour.times(hourlyRate).times(otMultiplier) val otCost = otHour.times(hourlyRate) //assigning data val projectTeam = ts.project!!.teamLead!!.team.code @@ -4433,7 +4432,7 @@ open class ReportService( val normalHour = ts.normalConsumed ?: 0.0 val otHour = ts.otConsumed ?: 0.0 val crossTeamMultiplier = 1.15 - val hourlyRate = thisSE!!.salary.hourlyRate.toDouble().times(crossTeamMultiplier) + val hourlyRate = (thisSE?.salary?.hourlyRate ?: ts.staff!!.salary.hourlyRate).toDouble() val normalCost = normalHour.times(hourlyRate) // val otCost = otHour.times(thisSE.salary.hourlyRate.toDouble()).times(otMultiplier) val otCost = otHour.times(hourlyRate) @@ -4449,7 +4448,6 @@ open class ReportService( } val tsInData = teamsMap[projectTeam]!!.In - if (!tsInData.containsKey(inOut_Key)) { tsInData.put(inOut_Key, mutableMapOf(projectNameCode to TsData(0.0, 0.0))) }