Browse Source

add crossTeam multiplier

add_swagger
MSI\derek 8 months ago
parent
commit
89869a2880
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt

+ 2
- 2
src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt View File

@@ -3887,12 +3887,12 @@ open class ReportService(
} }
println(_grade) println(_grade)
val gradeCode = _grade!!.grade.code val gradeCode = _grade!!.grade.code
// val otMultiplier = 1.15
val crossTeamMultiplier = 1.15
val thisSE = salaryEffective.find { val thisSE = salaryEffective.find {
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()
val hourlyRate = (thisSE?.salary?.hourlyRate ?: ts.staff!!.salary.hourlyRate).toDouble().times(crossTeamMultiplier)
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)


Loading…
Cancel
Save