Merge branch 'master' of https://git.2fi-solutions.com/davidhui/TSMS-backend

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)