MSI\derek
8 months ago
1 changed files with 2 additions and 4 deletions
Unified View
Diff Options
+ 2
- 4
src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
View File
| @@ -3895,11 +3895,10 @@ open class ReportService( | |||||
| it.staff.id == ts.staff!!.id | it.staff.id == ts.staff!!.id | ||||
| && it.startDate <= ts.recordDate && (it.endDate >= ts.recordDate || it.endDate == null) | && 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 normalHour = ts.normalConsumed ?: 0.0 | ||||
| val otHour = ts.otConsumed ?: 0.0 | val otHour = ts.otConsumed ?: 0.0 | ||||
| val normalCost = normalHour.times(hourlyRate) | val normalCost = normalHour.times(hourlyRate) | ||||
| // val otCost = otHour.times(hourlyRate).times(otMultiplier) | |||||
| val otCost = otHour.times(hourlyRate) | val otCost = otHour.times(hourlyRate) | ||||
| //assigning data | //assigning data | ||||
| val projectTeam = ts.project!!.teamLead!!.team.code | val projectTeam = ts.project!!.teamLead!!.team.code | ||||
| @@ -4433,7 +4432,7 @@ open class ReportService( | |||||
| val normalHour = ts.normalConsumed ?: 0.0 | val normalHour = ts.normalConsumed ?: 0.0 | ||||
| val otHour = ts.otConsumed ?: 0.0 | val otHour = ts.otConsumed ?: 0.0 | ||||
| val crossTeamMultiplier = 1.15 | 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 normalCost = normalHour.times(hourlyRate) | ||||
| // val otCost = otHour.times(thisSE.salary.hourlyRate.toDouble()).times(otMultiplier) | // val otCost = otHour.times(thisSE.salary.hourlyRate.toDouble()).times(otMultiplier) | ||||
| val otCost = otHour.times(hourlyRate) | val otCost = otHour.times(hourlyRate) | ||||
| @@ -4449,7 +4448,6 @@ open class ReportService( | |||||
| } | } | ||||
| val tsInData = teamsMap[projectTeam]!!.In | val tsInData = teamsMap[projectTeam]!!.In | ||||
| if (!tsInData.containsKey(inOut_Key)) { | if (!tsInData.containsKey(inOut_Key)) { | ||||
| tsInData.put(inOut_Key, mutableMapOf(projectNameCode to TsData(0.0, 0.0))) | tsInData.put(inOut_Key, mutableMapOf(projectNameCode to TsData(0.0, 0.0))) | ||||
| } | } | ||||